diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 10fec951feba694acdc49fc285eaccd99da35cc8..a2d721d1e66f48494abd01366ca37bb6ceceb6bf 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 f7505d30bbc1bbd0e804e688934f301b9f2bee07..18f7367cf42812b4fe298905a1c4272097fb2e76 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 8804b6a53c902a946c43224879873d0a2a3d59be..e520edaede8b1ecd59bd3fdde12fe35d02ef1538 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 6382b8bb56228f7173e18204f044cdfcf7978d0b..f2b03fb80b727deec1c245ad341b765037d6b255 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 0b2e10d091a9778e8032dc7e24104d70b17dfb46..25a052f6b9bc7a98bad52d605dfb07eddd0cafe7 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 d99ac9535b5d23318e16da7016e10569d5de53d7..84b23b1ffc469c97ee22b3c630ec64f862693dcc 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 f70d61dc3d2cacf217a67f45d13c54a5a1a857fc..d5c2f939ee695d42a24b5a468afe76f1b29f8680 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>
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 9a84301846b3bcb02e34dbdf917349583f8fcd88..d0e1b232587c44c7e0eec553ced08b8ea1893205 100755
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -11,10 +11,11 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 8e3c8b3c36c1a5d81f5fc42bc3f7afe4c2e3652f..4813a72c08eecbf840842d0394361cdc64828cce 100755
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -9,12 +9,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_g729.c b/formats/format_g729.c
index bb25f190f25588184e4579cd098ed1aa0586cc6e..19e6809be9cd0f0eb799a8ac6027eb64a0b7ed75 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 381733adac93c93c0daa61a0fa25fd9faae5b5bf..01fb2a1f94836b01493d547818e54e51fd458a1c 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 518ccf6ab20b59b0cb5ea3dd70d6e8010a23d1e9..990acbecc4be10d4f485b8a1d7d1af3a3ee507c0 100755
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 47a437c97bdab008289844c247d539eba7d0ab95..a690f2690128c3b1b646aba57da981578c510f4d 100755
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -13,12 +13,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index d3b8a04fbb43ddc1fe7b446b5f78bcd51761d507..5c28fe3d1265a60c8b13a1869aea9e5610fe44ab 100755
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index f53deb487114186585c209007870c2458ca6b939..b5de9f980c5451f1fdff2a0aa84769325e25ba4d 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -11,6 +11,7 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -18,7 +19,6 @@
 #include <sys/times.h>
 #include <sys/types.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 911163de941e7efa29e48e297638e5c01e48e2d3..3d051c1c121e5425ecda0fe44b403cbad6e9bfed 100755
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -9,12 +9,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 659281ea1cbc6ddc3f6c18af23a6aa776a4e07eb..e8f9218eaea2862593974bc5eb4e5f47ca4086bb 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 3e8117c3fb16ea00787e8504408671e10f9dc469..6e9246754ce28ee9d384000b61109379e3a25c8d 100755
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 441cb5d60395ca7fbb922d04fc3dd78768a7e01e..866c5f54ccb5b2a4303436a777e1ad6ad129966f 100755
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 443908578034a2db95216d4a5890d65e3b8c52d3..5b2001a6de22c62d28ada8f4c20d8a2a98255e07 100755
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <netinet/in.h>
+#include <arpa/inet.h>	/* we want to override inet_ntoa */
 #include <netdb.h>
 #include <pthread.h>
 #include <limits.h>
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 36149f39cac7b05fc6c48b9aeeda77a8e34c11b3..aa58d5556d2f99736a8eb3dbdca7e33ff06e308f 100755
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -11,8 +11,8 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>