Index: pbx/pbx_loopback.c
===================================================================
--- pbx/pbx_loopback.c	(revision 89240)
+++ pbx/pbx_loopback.c	(working copy)
@@ -26,12 +26,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -40,15 +37,11 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/frame.h"
-#include "asterisk/file.h"
-#include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/md5.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
-#include "asterisk/utils.h"
 #include "asterisk/crypto.h"
 #include "asterisk/astdb.h"
 
Index: pbx/pbx_spool.c
===================================================================
--- pbx/pbx_spool.c	(revision 89240)
+++ pbx/pbx_spool.c	(working copy)
@@ -26,18 +26,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/stat.h>
 #include <errno.h>
-#include <time.h>
 #include <utime.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <string.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
+#include <sys/stat.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -46,7 +40,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 
 /*
  * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality...
Index: pbx/pbx_realtime.c
===================================================================
--- pbx/pbx_realtime.c	(revision 89240)
+++ pbx/pbx_realtime.c	(working copy)
@@ -27,12 +27,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -44,14 +41,11 @@
 #include "asterisk/term.h"
 #include "asterisk/manager.h"
 #include "asterisk/file.h"
-#include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/md5.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
-#include "asterisk/utils.h"
 #include "asterisk/crypto.h"
 #include "asterisk/astdb.h"
 
Index: pbx/pbx_dundi.c
===================================================================
--- pbx/pbx_dundi.c	(revision 89240)
+++ pbx/pbx_dundi.c	(working copy)
@@ -30,13 +30,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/socket.h>
-#include <string.h>
 #include <errno.h>
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__)
 #include <sys/types.h>
@@ -44,7 +39,6 @@
 #endif
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
-#include <netinet/in.h>
 #include <net/if.h>
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
 #include <net/if_dl.h>
@@ -54,6 +48,7 @@
 #include <sys/signal.h>
 #include <pthread.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -62,14 +57,12 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/frame.h"
-#include "asterisk/file.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/md5.h"
 #include "asterisk/dundi.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
-#include "asterisk/utils.h"
 #include "asterisk/netsock.h"
 #include "asterisk/crypto.h"
 #include "asterisk/astdb.h"
Index: pbx/pbx_gtkconsole.c
===================================================================
--- pbx/pbx_gtkconsole.c	(revision 89240)
+++ pbx/pbx_gtkconsole.c	(working copy)
@@ -31,16 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <sys/time.h>
-
 #include <gtk/gtk.h>
 #include <glib.h>
 
Index: pbx/dundi-parser.c
===================================================================
--- pbx/dundi-parser.c	(revision 89240)
+++ pbx/dundi-parser.c	(working copy)
@@ -26,16 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-
 #include "asterisk/frame.h"
 #include "asterisk/utils.h"
 #include "asterisk/dundi.h"
Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 89240)
+++ channels/chan_sip.c	(working copy)
@@ -133,7 +133,6 @@
 #include "asterisk/astobj.h"
 #include "asterisk/dnsmgr.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/monitor.h"
 #include "asterisk/netsock.h"
Index: channels/chan_iax2.c
===================================================================
--- channels/chan_iax2.c	(revision 89240)
+++ channels/chan_iax2.c	(working copy)
@@ -91,7 +91,6 @@
 #include "asterisk/devicestate.h"
 #include "asterisk/netsock.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/event.h"
 #include "asterisk/astobj2.h"
 
Index: apps/app_chanspy.c
===================================================================
--- apps/app_chanspy.c	(revision 89240)
+++ apps/app_chanspy.c	(working copy)
@@ -31,12 +31,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -44,7 +41,6 @@
 #include "asterisk/features.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
-#include "asterisk/utils.h"
 #include "asterisk/say.h"
 #include "asterisk/pbx.h"
 #include "asterisk/translate.h"
Index: apps/app_adsiprog.c
===================================================================
--- apps/app_adsiprog.c	(revision 89240)
+++ apps/app_adsiprog.c	(working copy)
@@ -33,15 +33,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <errno.h>
+#include <ctype.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -49,7 +44,6 @@
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
 static char *app = "ADSIProg";
Index: apps/app_read.c
===================================================================
--- apps/app_read.c	(revision 89240)
+++ apps/app_read.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -42,7 +39,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/indications.h"
 
 enum {
Index: apps/app_festival.c
===================================================================
--- apps/app_festival.c	(revision 89240)
+++ apps/app_festival.c	(working copy)
@@ -31,20 +31,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
 #include <signal.h>
-#include <fcntl.h>
-#include <ctype.h>
+#include <sys/socket.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -52,7 +42,6 @@
 #include "asterisk/module.h"
 #include "asterisk/md5.h"
 #include "asterisk/config.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
Index: apps/app_alarmreceiver.c
===================================================================
--- apps/app_alarmreceiver.c	(revision 89240)
+++ apps/app_alarmreceiver.c	(working copy)
@@ -33,14 +33,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <sys/time.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -56,7 +51,6 @@
 #include "asterisk/localtime.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include "asterisk/utils.h"
 
 #define ALMRCV_CONFIG "alarmreceiver.conf"
 #define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
Index: apps/app_talkdetect.c
===================================================================
--- apps/app_talkdetect.c	(revision 89240)
+++ apps/app_talkdetect.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -40,7 +37,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/dsp.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
Index: apps/app_senddtmf.c
===================================================================
--- apps/app_senddtmf.c	(revision 89240)
+++ apps/app_senddtmf.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -41,7 +38,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
 
Index: apps/app_rpt.c
===================================================================
--- apps/app_rpt.c	(revision 89240)
+++ apps/app_rpt.c	(working copy)
@@ -208,26 +208,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <search.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/io.h>
-#include <math.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
Index: apps/app_mixmonitor.c
===================================================================
--- apps/app_mixmonitor.c	(revision 89240)
+++ apps/app_mixmonitor.c	(working copy)
@@ -37,11 +37,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -52,8 +48,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
-#include "asterisk/linkedlists.h"
-#include "asterisk/utils.h"
 
 #define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
 
Index: apps/app_milliwatt.c
===================================================================
--- apps/app_milliwatt.c	(revision 89240)
+++ apps/app_milliwatt.c	(working copy)
@@ -29,19 +29,15 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/utils.h"
 
 static char *app = "Milliwatt";
 
Index: apps/app_meetme.c
===================================================================
--- apps/app_meetme.c	(revision 89240)
+++ apps/app_meetme.c	(working copy)
@@ -37,14 +37,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/zapata.h"
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -59,7 +56,6 @@
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
-#include "asterisk/utils.h"
 #include "asterisk/translate.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/astobj.h"
Index: apps/app_test.c
===================================================================
--- apps/app_test.c	(revision 89240)
+++ apps/app_test.c	(working copy)
@@ -31,14 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
Index: apps/app_dumpchan.c
===================================================================
--- apps/app_dumpchan.c	(revision 89240)
+++ apps/app_dumpchan.c	(working copy)
@@ -32,20 +32,14 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include "asterisk/utils.h"
 
 static char *app = "DumpChan";
 static char *synopsis = "Dump Info About The Calling Channel";
Index: apps/app_minivm.c
===================================================================
--- apps/app_minivm.c	(revision 89240)
+++ apps/app_minivm.c	(working copy)
@@ -141,24 +141,17 @@
  * Back: \ref App_minivm
  */
 
-#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
 #include <ctype.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
 #include <dirent.h>
 #include <locale.h>
+#include <sys/stat.h>
 
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/utils.h"
 #include "asterisk/astobj.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
@@ -174,8 +167,6 @@
 #include "asterisk/dsp.h"
 #include "asterisk/localtime.h"
 #include "asterisk/cli.h"
-#include "asterisk/utils.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/callerid.h"
 
 #ifndef TRUE
Index: apps/app_macro.c
===================================================================
--- apps/app_macro.c	(revision 89240)
+++ apps/app_macro.c	(working copy)
@@ -29,12 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -42,7 +37,6 @@
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/config.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
 #define MAX_ARGS 80
Index: apps/app_sms.c
===================================================================
--- apps/app_sms.c	(revision 89240)
+++ apps/app_sms.c	(working copy)
@@ -38,16 +38,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -57,7 +52,6 @@
 #include "asterisk/module.h"
 #include "asterisk/alaw.h"
 #include "asterisk/callerid.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 
 /* #define OUTALAW */ /* enable this to output Alaw rather than linear */
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 89240)
+++ apps/app_voicemail.c	(working copy)
@@ -65,17 +65,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
 #include <dirent.h>
+#include <errno.h>
 
 #ifdef IMAP_STORAGE
 #include <ctype.h>
@@ -92,6 +84,7 @@
 #endif
 #endif
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -107,7 +100,6 @@
 #include "asterisk/dsp.h"
 #include "asterisk/localtime.h"
 #include "asterisk/cli.h"
-#include "asterisk/utils.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/smdi.h"
 #include "asterisk/event.h"
Index: apps/app_readexten.c
===================================================================
--- apps/app_readexten.c	(revision 89240)
+++ apps/app_readexten.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -41,7 +38,6 @@
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/indications.h"
 
 enum {
Index: apps/app_playback.c
===================================================================
--- apps/app_playback.c	(revision 89240)
+++ apps/app_playback.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -40,7 +37,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/cli.h"
Index: apps/app_osplookup.c
===================================================================
--- apps/app_osplookup.c	(revision 89240)
+++ apps/app_osplookup.c	(working copy)
@@ -37,10 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <osp/osp.h>
 #include <osp/osputils.h>
Index: apps/app_zapbarge.c
===================================================================
--- apps/app_zapbarge.c	(revision 89240)
+++ apps/app_zapbarge.c	(working copy)
@@ -39,13 +39,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include "asterisk/zapata.h"
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -57,7 +54,6 @@
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
-#include "asterisk/utils.h"
 
 static char *app = "ZapBarge";
 
Index: apps/app_zapscan.c
===================================================================
--- apps/app_zapscan.c	(revision 89240)
+++ apps/app_zapscan.c	(working copy)
@@ -38,14 +38,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/zapata.h"
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -55,7 +52,6 @@
 #include "asterisk/config.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
-#include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 
Index: apps/app_directory.c
===================================================================
--- apps/app_directory.c	(revision 89240)
+++ apps/app_directory.c	(working copy)
@@ -29,11 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -42,7 +40,6 @@
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 
 #ifdef ODBC_STORAGE
Index: apps/app_while.c
===================================================================
--- apps/app_while.c	(revision 89240)
+++ apps/app_while.c	(working copy)
@@ -29,15 +29,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
-#include "asterisk/utils.h"
 #include "asterisk/config.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
Index: apps/app_privacy.c
===================================================================
--- apps/app_privacy.c	(revision 89240)
+++ apps/app_privacy.c	(working copy)
@@ -29,13 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/utils.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
Index: apps/app_record.c
===================================================================
--- apps/app_record.c	(revision 89240)
+++ apps/app_record.c	(working copy)
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -41,7 +38,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/dsp.h"
-#include "asterisk/utils.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
 
Index: apps/app_authenticate.c
===================================================================
--- apps/app_authenticate.c	(revision 89240)
+++ apps/app_authenticate.c	(working copy)
@@ -29,12 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
-#include <stdio.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -43,7 +40,6 @@
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"
-#include "asterisk/utils.h"
 #include "asterisk/options.h"
 
 enum {
Index: apps/app_queue.c
===================================================================
--- apps/app_queue.c	(revision 89240)
+++ apps/app_queue.c	(working copy)
@@ -60,16 +60,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <netinet/in.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -77,7 +70,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/say.h"
@@ -87,7 +79,6 @@
 #include "asterisk/manager.h"
 #include "asterisk/config.h"
 #include "asterisk/monitor.h"
-#include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astdb.h"
 #include "asterisk/devicestate.h"
Index: apps/app_followme.c
===================================================================
--- apps/app_followme.c	(revision 89240)
+++ apps/app_followme.c	(working copy)
@@ -32,12 +32,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -53,7 +48,6 @@
 #include "asterisk/manager.h"
 #include "asterisk/config.h"
 #include "asterisk/monitor.h"
-#include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astdb.h"
 #include "asterisk/app.h"
Index: funcs/func_rand.c
===================================================================
--- funcs/func_rand.c	(revision 89240)
+++ funcs/func_rand.c	(working copy)
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_base64.c
===================================================================
--- funcs/func_base64.c	(revision 89240)
+++ funcs/func_base64.c	(working copy)
@@ -26,11 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_module.c
===================================================================
--- funcs/func_module.c	(revision 89240)
+++ funcs/func_module.c	(working copy)
@@ -25,12 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_md5.c
===================================================================
--- funcs/func_md5.c	(revision 89240)
+++ funcs/func_md5.c	(working copy)
@@ -30,11 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_dialgroup.c
===================================================================
--- funcs/func_dialgroup.c	(revision 89240)
+++ funcs/func_dialgroup.c	(working copy)
@@ -29,12 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_env.c
===================================================================
--- funcs/func_env.c	(revision 89240)
+++ funcs/func_env.c	(working copy)
@@ -25,10 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include "asterisk/module.h"
Index: funcs/func_strings.c
===================================================================
--- funcs/func_strings.c	(revision 89240)
+++ funcs/func_strings.c	(working copy)
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
 #include <regex.h>
 
 #include "asterisk/module.h"
Index: funcs/func_vmcount.c
===================================================================
--- funcs/func_vmcount.c	(revision 89240)
+++ funcs/func_vmcount.c	(working copy)
@@ -29,19 +29,14 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <sys/types.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
 
Index: funcs/func_sha1.c
===================================================================
--- funcs/func_sha1.c	(revision 89240)
+++ funcs/func_sha1.c	(working copy)
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_logic.c
===================================================================
--- funcs/func_logic.c	(revision 89240)
+++ funcs/func_logic.c	(working copy)
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_uri.c
===================================================================
--- funcs/func_uri.c	(revision 89240)
+++ funcs/func_uri.c	(working copy)
@@ -32,11 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_enum.c
===================================================================
--- funcs/func_enum.c	(revision 89240)
+++ funcs/func_enum.c	(working copy)
@@ -37,9 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_groupcount.c
===================================================================
--- funcs/func_groupcount.c	(revision 89240)
+++ funcs/func_groupcount.c	(working copy)
@@ -25,11 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_volume.c
===================================================================
--- funcs/func_volume.c	(revision 89240)
+++ funcs/func_volume.c	(working copy)
@@ -30,8 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_shell.c
===================================================================
--- funcs/func_shell.c	(revision 89240)
+++ funcs/func_shell.c	(working copy)
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_version.c
===================================================================
--- funcs/func_version.c	(revision 89240)
+++ funcs/func_version.c	(working copy)
@@ -26,11 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_db.c
===================================================================
--- funcs/func_db.c	(revision 89240)
+++ funcs/func_db.c	(working copy)
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include <regex.h>
 
 #include "asterisk/module.h"
Index: funcs/func_timeout.c
===================================================================
--- funcs/func_timeout.c	(revision 89240)
+++ funcs/func_timeout.c	(working copy)
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_math.c
===================================================================
--- funcs/func_math.c	(revision 89240)
+++ funcs/func_math.c	(working copy)
@@ -30,11 +30,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <math.h>
-#include <sys/types.h>
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
Index: funcs/func_global.c
===================================================================
--- funcs/func_global.c	(revision 89240)
+++ funcs/func_global.c	(working copy)
@@ -29,12 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_extstate.c
===================================================================
--- funcs/func_extstate.c	(revision 89240)
+++ funcs/func_extstate.c	(working copy)
@@ -30,8 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_realtime.c
===================================================================
--- funcs/func_realtime.c	(revision 89240)
+++ funcs/func_realtime.c	(working copy)
@@ -28,12 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
@@ -42,7 +37,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 
 static int function_realtime_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) 
Index: funcs/func_curl.c
===================================================================
--- funcs/func_curl.c	(revision 89240)
+++ funcs/func_curl.c	(working copy)
@@ -38,11 +38,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <curl/curl.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -52,7 +50,6 @@
 #include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
 
 struct MemoryStruct {
Index: funcs/func_cdr.c
===================================================================
--- funcs/func_cdr.c	(revision 89240)
+++ funcs/func_cdr.c	(working copy)
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_channel.c
===================================================================
--- funcs/func_channel.c	(revision 89240)
+++ funcs/func_channel.c	(working copy)
@@ -27,11 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_iconv.c
===================================================================
--- funcs/func_iconv.c	(revision 89240)
+++ funcs/func_iconv.c	(working copy)
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 #include <iconv.h>
Index: funcs/func_callerid.c
===================================================================
--- funcs/func_callerid.c	(revision 89240)
+++ funcs/func_callerid.c	(working copy)
@@ -25,11 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: funcs/func_devstate.c
===================================================================
--- funcs/func_devstate.c	(revision 89240)
+++ funcs/func_devstate.c	(working copy)
@@ -32,13 +32,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/cli.h"
 #include "asterisk/astdb.h"
Index: main/config.c
===================================================================
--- main/config.c	(revision 89240)
+++ main/config.c	(working copy)
@@ -30,14 +30,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <time.h>
 #include <sys/stat.h>
-#include <sys/socket.h>		/* for AF_INET */
+#include <sys/socket.h>
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
 #if defined(__Darwin__) || defined(__CYGWIN__)
Index: main/loader.c
===================================================================
--- main/loader.c	(revision 89240)
+++ main/loader.c	(working copy)
@@ -31,12 +31,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
Index: main/cdr.c
===================================================================
--- main/cdr.c	(revision 89240)
+++ main/cdr.c	(working copy)
@@ -35,10 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <signal.h>
 
 #include "asterisk/lock.h"
@@ -48,7 +44,6 @@
 #include "asterisk/callerid.h"
 #include "asterisk/causes.h"
 #include "asterisk/options.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"
 #include "asterisk/sched.h"
 #include "asterisk/config.h"
Index: main/channel.c
===================================================================
--- main/channel.c	(revision 89240)
+++ main/channel.c	(working copy)
@@ -27,14 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <math.h>
 
 #include "asterisk/zapata.h"
@@ -52,7 +46,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/manager.h"
 #include "asterisk/chanvars.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/indications.h"
 #include "asterisk/monitor.h"
 #include "asterisk/causes.h"
Index: main/manager.c
===================================================================
--- main/manager.c	(revision 89240)
+++ main/manager.c	(working copy)
@@ -45,20 +45,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sys/mman.h>
 
 #include "asterisk/channel.h"
Index: main/http.c
===================================================================
--- main/http.c	(revision 89240)
+++ main/http.c	(working copy)
@@ -32,24 +32,13 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.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 <unistd.h>
+#include <signal.h>
 #include <pthread.h>
 
-#include "minimime/mm.h"
-
 #include "asterisk/cli.h"
 #include "asterisk/http.h"
 #include "asterisk/utils.h"
@@ -60,6 +49,8 @@
 #include "asterisk/version.h"
 #include "asterisk/manager.h"
 
+#include "minimime/mm.h"
+
 #define MAX_PREFIX 80
 #define DEFAULT_PREFIX "/asterisk"
 
Index: main/app.c
===================================================================
--- main/app.c	(revision 89240)
+++ main/app.c	(working copy)
@@ -27,19 +27,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <regex.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <regex.h>
-#include <fcntl.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
Index: main/db.c
===================================================================
--- main/db.c	(revision 89240)
+++ main/db.c	(working copy)
@@ -31,15 +31,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <dirent.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/app.h"
@@ -48,7 +43,6 @@
 #include "asterisk/options.h"
 #include "asterisk/astdb.h"
 #include "asterisk/cli.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/manager.h"
 #include "db1-ast/include/db.h"
Index: main/stdtime/localtime.c
===================================================================
--- main/stdtime/localtime.c	(revision 89240)
+++ main/stdtime/localtime.c	(working copy)
@@ -44,7 +44,6 @@
 
 /*LINTLIBRARY*/
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef DEBUG
Index: main/jitterbuf.c
===================================================================
--- main/jitterbuf.c	(revision 89240)
+++ main/jitterbuf.c	(working copy)
@@ -31,11 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "jitterbuf.h"
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
Index: main/acl.c
===================================================================
--- main/acl.c	(revision 89240)
+++ main/acl.c	(working copy)
@@ -27,22 +27,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/socket.h>
-#include <netdb.h>
 #include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <sys/ioctl.h>
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
Index: main/rtp.c
===================================================================
--- main/rtp.c	(revision 89240)
+++ main/rtp.c	(working copy)
@@ -30,17 +30,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
 #include <fcntl.h>
 
 #include "asterisk/rtp.h"
Index: main/chanvars.c
===================================================================
--- main/chanvars.c	(revision 89240)
+++ main/chanvars.c	(working copy)
@@ -27,10 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "asterisk/chanvars.h"
 #include "asterisk/logger.h"
 #include "asterisk/strings.h"
Index: main/hashtab.c
===================================================================
--- main/hashtab.c	(revision 89240)
+++ main/hashtab.c	(working copy)
@@ -26,13 +26,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <stddef.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
@@ -43,7 +38,6 @@
 #include "asterisk/term.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/hashtab.h"
 
 static void ast_hashtab_resize( struct ast_hashtab *tab);
Index: main/fixedjitterbuf.c
===================================================================
--- main/fixedjitterbuf.c	(revision 89240)
+++ main/fixedjitterbuf.c	(working copy)
@@ -29,11 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <assert.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/utils.h"
 #include "fixedjitterbuf.h"
Index: main/abstract_jb.c
===================================================================
--- main/abstract_jb.c	(revision 89240)
+++ main/abstract_jb.c	(working copy)
@@ -31,9 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
Index: main/event.c
===================================================================
--- main/event.c	(revision 89240)
+++ main/event.c	(working copy)
@@ -27,9 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "asterisk/event.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/lock.h"
Index: main/asterisk.c
===================================================================
--- main/asterisk.c	(revision 89240)
+++ main/asterisk.c	(working copy)
@@ -63,23 +63,15 @@
 
 #undef sched_setscheduler
 #undef setpriority
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sched.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <sys/resource.h>
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
+#include <signal.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
@@ -125,7 +117,6 @@
 #include "editline/histedit.h"
 #include "asterisk/config.h"
 #include "asterisk/version.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/module.h"
 
Index: main/dsp.c
===================================================================
--- main/dsp.c	(revision 89240)
+++ main/dsp.c	(working copy)
@@ -44,13 +44,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <math.h>
 #include <errno.h>
-#include <stdio.h>
 
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
Index: main/udptl.c
===================================================================
--- main/udptl.c	(revision 89240)
+++ main/udptl.c	(working copy)
@@ -50,17 +50,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <sys/time.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
 #include <fcntl.h>
 
 #include "asterisk/udptl.h"
Index: main/autoservice.c
===================================================================
--- main/autoservice.c	(revision 89240)
+++ main/autoservice.c	(working copy)
@@ -27,13 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
+#include <signal.h>
 
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
Index: main/frame.c
===================================================================
--- main/frame.c	(revision 89240)
+++ main/frame.c	(working copy)
@@ -27,11 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
@@ -42,7 +38,6 @@
 #include "asterisk/term.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
-#include "asterisk/linkedlists.h"
 
 #ifdef TRACE_FRAMES
 static int headers;
Index: main/say.c
===================================================================
--- main/say.c	(revision 89240)
+++ main/say.c	(working copy)
@@ -35,19 +35,14 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <time.h>
 #include <ctype.h>
 #include <math.h>
-#include <stdio.h>
 
 #ifdef SOLARIS
 #include <iso/limits_iso.h>
 #endif
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
@@ -55,7 +50,6 @@
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/localtime.h"
-#include "asterisk/utils.h"
 
 /* Forward declaration */
 static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang);
Index: main/devicestate.c
===================================================================
--- main/devicestate.c	(revision 89240)
+++ main/devicestate.c	(working copy)
@@ -112,12 +112,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
Index: main/indications.c
===================================================================
--- main/indications.c	(revision 89240)
+++ main/indications.c	(working copy)
@@ -32,9 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <math.h>
 
 #include "asterisk/lock.h"
Index: main/enum.c
===================================================================
--- main/enum.c	(revision 89240)
+++ main/enum.c	(working copy)
@@ -44,21 +44,16 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <resolv.h>
 #ifdef __APPLE__
 #if __APPLE_CC__ >= 1495
 #include <arpa/nameser_compat.h>
 #endif
 #endif
-#include <resolv.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <regex.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/logger.h"
Index: main/io.c
===================================================================
--- main/io.c	(revision 89240)
+++ main/io.c	(working copy)
@@ -27,12 +27,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <termios.h>
-#include <string.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #include "asterisk/io.h"
 #include "asterisk/logger.h"
Index: main/cli.c
===================================================================
--- main/cli.c	(revision 89240)
+++ main/cli.c	(working copy)
@@ -27,12 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/signal.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
 #include <ctype.h>
 #include <regex.h>
 
Index: main/dial.c
===================================================================
--- main/dial.c	(revision 89240)
+++ main/dial.c	(working copy)
@@ -27,13 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
Index: main/sched.c
===================================================================
--- main/sched.c	(revision 89240)
+++ main/sched.c	(working copy)
@@ -36,12 +36,6 @@
 #define DEBUG(a) 
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/sched.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 89240)
+++ main/pbx.c	(working copy)
@@ -27,15 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <time.h>
-#include <sys/time.h>
 #include <limits.h>
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
Index: main/dnsmgr.c
===================================================================
--- main/dnsmgr.c	(revision 89240)
+++ main/dnsmgr.c	(working copy)
@@ -27,17 +27,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <regex.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include "asterisk/dnsmgr.h"
 #include "asterisk/linkedlists.h"
Index: main/netsock.c
===================================================================
--- main/netsock.c	(revision 89240)
+++ main/netsock.c	(working copy)
@@ -29,21 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/socket.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <sys/ioctl.h>
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
Index: main/srv.c
===================================================================
--- main/srv.c	(revision 89240)
+++ main/srv.c	(working copy)
@@ -36,15 +36,12 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <resolv.h>
 #ifdef __APPLE__
 #if __APPLE_CC__ >= 1495
 #include <arpa/nameser_compat.h>
 #endif
 #endif
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
Index: main/privacy.c
===================================================================
--- main/privacy.c	(revision 89240)
+++ main/privacy.c	(working copy)
@@ -27,13 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <dirent.h>
 
 #include "asterisk/channel.h"
Index: main/file.c
===================================================================
--- main/file.c	(revision 89240)
+++ main/file.c	(working copy)
@@ -27,17 +27,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
 #include <dirent.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/frame.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
@@ -46,11 +40,9 @@
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 
 /*
Index: main/callerid.c
===================================================================
--- main/callerid.c	(revision 89240)
+++ main/callerid.c	(working copy)
@@ -27,11 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <time.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <math.h>
 #include <ctype.h>
 
Index: main/audiohook.c
===================================================================
--- main/audiohook.c	(revision 89240)
+++ main/audiohook.c	(working copy)
@@ -27,12 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
Index: res/res_jabber.c
===================================================================
--- res/res_jabber.c	(revision 89240)
+++ res/res_jabber.c	(working copy)
@@ -35,10 +35,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <iksemel.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/jabber.h"
 #include "asterisk/file.h"
@@ -52,7 +51,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/md5.h"
 #include "asterisk/acl.h"
-#include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/astobj.h"
 #include "asterisk/astdb.h"
Index: res/res_config_sqlite.c
===================================================================
--- res/res_config_sqlite.c	(revision 89240)
+++ res/res_config_sqlite.c	(working copy)
@@ -98,7 +98,6 @@
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include "asterisk/linkedlists.h"
 
 #define MACRO_BEGIN	do {
 #define MACRO_END	} while (0)
Index: res/res_monitor.c
===================================================================
--- res/res_monitor.c	(revision 89240)
+++ res/res_monitor.c	(working copy)
@@ -27,14 +27,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <libgen.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
@@ -45,7 +42,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/monitor.h"
 #include "asterisk/app.h"
-#include "asterisk/utils.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 
Index: res/res_config_odbc.c
===================================================================
--- res/res_config_odbc.c	(revision 89240)
+++ res/res_config_odbc.c	(working copy)
@@ -38,11 +38,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -52,7 +48,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/res_odbc.h"
-#include "asterisk/utils.h"
 
 struct custom_prepare_struct {
 	const char *sql;
Index: res/res_smdi.c
===================================================================
--- res/res_smdi.c	(revision 89240)
+++ res/res_smdi.c	(working copy)
@@ -26,11 +26,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <termios.h>
-#include <sys/time.h>
 #include <time.h>
 #include <ctype.h>
 
Index: res/res_agi.c
===================================================================
--- res/res_agi.c	(revision 89240)
+++ res/res_agi.c	(working copy)
@@ -27,25 +27,16 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
 #include <math.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include <signal.h>
-#include <sys/time.h>
-#include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -61,7 +52,6 @@
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
 #include "asterisk/musiconhold.h"
-#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/strings.h"
 #include "asterisk/agi.h"
Index: res/res_indications.c
===================================================================
--- res/res_indications.c	(revision 89240)
+++ res/res_indications.c	(working copy)
@@ -28,15 +28,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
@@ -47,7 +43,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/indications.h"
-#include "asterisk/utils.h"
 
 /* Globals */
 static const char config[] = "indications.conf";
Index: res/ael/pval.c
===================================================================
--- res/ael/pval.c	(revision 89240)
+++ res/ael/pval.c	(working copy)
@@ -27,11 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <regex.h>
Index: res/res_speech.c
===================================================================
--- res/res_speech.c	(revision 89240)
+++ res/res_speech.c	(working copy)
@@ -35,7 +35,6 @@
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/linkedlists.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
 #include "asterisk/options.h"
Index: res/res_clioriginate.c
===================================================================
--- res/res_clioriginate.c	(revision 89240)
+++ res/res_clioriginate.c	(working copy)
@@ -28,10 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/logger.h"
Index: res/res_features.c
===================================================================
--- res/res_features.c	(revision 89240)
+++ res/res_features.c	(working copy)
@@ -28,16 +28,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <pthread.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/time.h>
 #include <sys/signal.h>
-#include <netinet/in.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -54,7 +49,6 @@
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 #include "asterisk/manager.h"
-#include "asterisk/utils.h"
 #include "asterisk/adsi.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/monitor.h"
Index: res/res_crypto.c
===================================================================
--- res/res_crypto.c	(revision 89240)
+++ res/res_crypto.c	(working copy)
@@ -37,13 +37,11 @@
 #include <sys/types.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include <stdio.h>
 #include <dirent.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
@@ -55,7 +53,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/io.h"
 #include "asterisk/lock.h"
-#include "asterisk/utils.h"
 
 /*
  * Asterisk uses RSA keys with SHA-1 message digests for its
Index: res/res_musiconhold.c
===================================================================
--- res/res_musiconhold.c	(revision 89240)
+++ res/res_musiconhold.c	(working copy)
@@ -34,20 +34,13 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
-#include <unistd.h>
-#include <string.h>
+#include <sys/types.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
 #include <sys/signal.h>
-#include <netinet/in.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #ifdef SOLARIS
 #include <thread.h>
@@ -55,6 +48,7 @@
 
 #include "asterisk/zapata.h"
 
+#include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -66,10 +60,8 @@
 #include "asterisk/say.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/config.h"
-#include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/linkedlists.h"
 
 #define INITIAL_NUM_FILES   8