header ordering fixes for FreeBSD (pending a global merge into asterisk.h) (bug #4484)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5876 f38db490-d61c-443f-a65b-d21fe96a405b

7 files changed, 16 insertions, 11 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 10fec951f..a2d721d1e 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -13,12 +13,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <errno.h>
 #include <unistd.h>
+#include <sys/socket.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
 
diff --git a/channels/chan_features.c b/channels/chan_features.c
index f7505d30b..18f7367cf 100755
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -13,12 +13,13 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
 
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 8804b6a53..e520edaed 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -13,12 +13,13 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
 
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 6382b8bb5..f2b03fb80 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -55,19 +55,20 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
+#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include <arpa/inet.h>
 #include <ctype.h>
 
 #include "asterisk.h"
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index 0b2e10d09..25a052f6b 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -13,18 +13,18 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 #include <sys/signal.h>
-#include <ctype.h>
 
 #include "asterisk.h"
 
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d99ac9535..84b23b1ff 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15,18 +15,19 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <arpa/inet.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>
 
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index f70d61dc3..d5c2f939e 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -16,13 +16,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>