diff --git a/Makefile.rules b/Makefile.rules
index 2851d2f9f4..b71c5d2b9b 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -38,7 +38,7 @@ ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     # ppro's, etc, as well as the AMD K6 and K7.  
     #K6OPT=-DK6OPT
 
-    OPTIMIZE?=-O6
+    OPTIMIZE?=-O2
     ASTCFLAGS+=$(OPTIMIZE)
 endif
 
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 23af168979..75cb3ae090 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -33,13 +33,8 @@
 
 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 "asterisk/file.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 194a332374..6c7a0a41fb 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -33,12 +33,8 @@
 
 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/lock.h"
diff --git a/apps/app_amd.c b/apps/app_amd.c
index a33bb72173..fbf23c9dec 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -31,9 +31,6 @@
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 8533f151d5..0409257381 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -29,11 +29,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/file.h"
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 8497405a69..8ef10ba978 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -29,9 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index b5c2736904..2cf79138dc 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 6df4cb8d15..c446d277bb 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -27,11 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index c30a427a2b..4061ac91df 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 
 #include "asterisk/file.h"
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 18b8d43270..dc3e112fcb 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_db.c b/apps/app_db.c
index 573ecb4ae7..777d20150c 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -32,12 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
 #include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 42a624de3d..00fe86bc34 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -29,11 +29,7 @@
 
 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/signal.h>
 #include <sys/stat.h>
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 812e579b82..db518788fe 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 
 #include "asterisk/file.h"
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index e5c6af3072..390e5b01a1 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 010899d378..d316f1a6a1 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -29,10 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 3756c3d5ec..cffca0ff03 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -30,9 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 #include <sys/time.h>
 
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index ecffe488e4..156109185c 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -32,11 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 1420131dfd..44e6f09819 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 6a13e18018..3513b3b2af 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -30,11 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 2ebaead0cf..3774c8ad87 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -35,10 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <signal.h>
 
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 835cedeaf2..5b2f85cd09 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -31,16 +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>
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 45b0fc3d3e..d1d33ebf30 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -33,9 +33,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include "asterisk/zapata.h"
 
diff --git a/apps/app_followme.c b/apps/app_followme.c
index c5a5723acb..dee42c2be6 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -32,10 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <signal.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index e18a6009e1..cc1872c7ab 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -30,11 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 37ee66bca1..7cbf986f69 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index fe900ef4a6..a015b0d5bf 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -31,11 +31,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdio.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/apps/app_image.c b/apps/app_image.c
index 302c3ac394..875f2a6178 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 3ac80cbb40..2e7cb05c40 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -33,11 +33,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 47bc42b25f..37b7a0aeaa 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -29,12 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8d875e99c8..0587d73795 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -37,10 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/zapata.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 022eb6f3b5..63ce6f9f63 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 1bca5a333c..d2c2abe6df 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -141,23 +141,19 @@
  * Back: \ref App_minivm
  */
 
-#include <stdlib.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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 "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/astobj.h"
 #include "asterisk/lock.h"
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 9c8ba0b35b..c30a737cda 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -37,11 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index c8283948db..08a4ec844d 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 7dc2d4cf16..3243713a79 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -29,13 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
+#include <signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 6c9097cc1b..e076dea84b 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -29,14 +29,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index aa65257e6b..13e43ea959 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -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>
diff --git a/apps/app_page.c b/apps/app_page.c
index bc701f5ee1..e2e7472a1d 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -34,10 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/options.h"
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 51841d8d35..c13ea5ad7a 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -33,12 +33,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index ea091a9d19..1b7cf1f75f 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index e470b9ed02..02bae73028 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e559268196..3ceecb72f5 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -60,12 +60,7 @@
 
 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>
diff --git a/apps/app_read.c b/apps/app_read.c
index 4422cb1571..32e9202bef 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index cfb8f09cf0..fbff8833a0 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index d1bedcbce8..2ea9fb592f 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_record.c b/apps/app_record.c
index 83d4000fd6..273b702b4f 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 14831eb07e..0b149c68a6 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -209,12 +209,7 @@ enum {HF_SCAN_OFF, HF_SCAN_DOWN_SLOW, HF_SCAN_DOWN_QUICK,
 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>
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 0c433cdbf1..006782496c 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index f1bfee9bf9..a1626853d0 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 6a9cd30b03..01a2dea297 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -31,10 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 6a236a0cd6..3b542fb3eb 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 527fc776df..518da50731 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -34,11 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index b1cbfbb71c..12acdb7476 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -38,14 +38,9 @@
 
 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/lock.h"
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index ee6c92a053..4c22cc27e8 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -29,12 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 693546afcb..1a4cf23bac 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 753048f370..dac03125d9 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -29,11 +29,6 @@
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index ded110caea..2e22b37538 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 415bc0a2de..48ac4dd8d2 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index ae49fa2965..b2a8406473 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -31,12 +31,7 @@
 
 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"
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index a6359a6d43..1309d9d62b 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -31,11 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index e32957a6e5..1d505cdddc 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 8b61b6d2ff..44bf2e0bff 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -25,11 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 97e441afc6..80af802847 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5fb1b84493..c140a635db 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -65,14 +65,9 @@ c-client (http://www.washington.edu/imap/
 
 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>
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index b7064c1151..e66a941829 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -29,12 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index f2adbf23f3..265d4639e0 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -36,11 +36,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index 7569ccd176..bb3956a1fa 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 3d665795c0..c3467e1c74 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index db7ffbc9cd..2c321b6927 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -39,10 +39,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include "asterisk/zapata.h"
 
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index cdbdc5a89e..a15f0c2b2c 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -41,11 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #endif /* __linux__ */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include "asterisk/zapata.h"
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 343c47da64..95721b871f 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -38,10 +38,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "asterisk/zapata.h"
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index 129ae16824..b5b83cd02d 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -33,10 +33,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
 #include <sql.h>
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 1a0fcaa30c..2db2221b06 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -32,13 +32,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "asterisk/config.h"
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index fe65abd8c8..d84746eb5e 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -34,13 +34,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 0627180390..e204337d57 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -29,9 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <strings.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 1223347b39..effa615123 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -37,12 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "asterisk/config.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index ac43e96f83..0750a2dab9 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -41,11 +41,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 
 #include <libpq-fe.h>
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 207e247628..cc77090166 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -34,13 +34,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 #include <time.h>
-#include <sys/types.h>
 #include <radiusclient-ng.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 2c526a60c3..b08ce164d3 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -42,11 +42,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sqlite.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index a3ca00a4ec..8f87620ed8 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -40,13 +40,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 #include <time.h>
-#include <sys/types.h>
 #include <sqlite3.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 4acd5359e8..64faef59c3 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -63,11 +63,6 @@ CREATE TABLE [dbo].[cdr] (
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
 #include <math.h>
 
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 99462e78dd..5f6fc2933a 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -35,12 +35,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sys/socket.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index fefde1eb1f..282dd0cf4b 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -35,14 +35,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 98e14c0af0..6bb9bbe4c2 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -34,12 +34,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 6f106bde92..2c72c78d4a 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -35,13 +35,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 735fde2c20..457a8a94ff 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -59,11 +59,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <netdb.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index ce533a2504..c50ac13964 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -37,9 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <sys/mman.h>
 #include <dirent.h>
 #include <sys/socket.h>
@@ -50,10 +47,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <string.h>
 #include <strings.h>
 #include <errno.h>
-#include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 16d906c910..48e1c5e036 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -37,10 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/channels/chan_local.c b/channels/chan_local.c
index e79057ee41..b6062cd66f 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -29,12 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b0b138a00c..3984ae9780 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -32,14 +32,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#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 <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 9d43309aa6..02a8559b81 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -38,14 +38,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
 #include <pthread.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index d2718b3de7..1712942d48 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -33,13 +33,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 64f64dfa4f..cc65f47387 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -40,15 +40,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
 #include <ctype.h>
 #include <math.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #ifdef __linux
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index d657920c3f..faec92c4d2 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -33,14 +33,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fc52659361..6a057d3153 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -87,15 +87,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#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 <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <signal.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index fd1dcb4123..105e6ce071 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -30,10 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index f96eb360c3..4cc0b9eb9a 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -36,15 +36,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <net/if.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index fc77b73e3c..47952c5607 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -42,15 +42,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
 #include <ctype.h>
 #include <math.h>
-#include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <usb.h>
 #include <alsa/asoundlib.h>
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 8528727148..bf4ef0ff77 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -39,9 +39,6 @@ extern "C" {
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
@@ -59,8 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2ea37472cf..b619be123b 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -50,8 +50,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
 #ifdef __NetBSD__
 #include <pthread.h>
 #include <signal.h>
@@ -59,11 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/signal.h>
 #endif
 #include <errno.h>
-#include <stdlib.h>
-#if !defined(SOLARIS) && !defined(__FreeBSD__)
-#include <stdint.h>
-#endif
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <math.h>
 #include <ctype.h>
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index a2ec425089..a86bf74284 100644
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -27,14 +27,9 @@
 
 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 "asterisk/frame.h"
 #include "asterisk/utils.h"
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 8e22e88d53..5c0f932409 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -27,10 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 12b299343a..2bd7ef9a8a 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -30,9 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 
 #include "chan_misdn_config.h"
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 40e14ca5e5..8cf89b68a3 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index a40bbbc9f6..c63544b773 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -33,10 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index f4436d1624..c7a85feb26 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 54802dc8b3..38014dabe7 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -32,10 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 183c4a9e42..9ef79add71 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -33,10 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 3fbcf9c8e2..99b5322d04 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -35,11 +35,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index ea84eded32..5caec75f53 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -30,11 +30,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index ca49643362..bee74ddf9a 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -32,11 +32,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index bbb6be2382..2053490566 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -39,11 +39,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
 #include <speex/speex.h>
 
 /* We require a post 1.1.8 version of Speex to enable preprocessing
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index b10054f3e8..47c0b8a939 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index 11e18600a3..31c84438a2 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -36,11 +36,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/mman.h>
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 64883fe88c..9a9f1af30a 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -29,13 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 #include <sys/time.h>
 
 #include "asterisk/lock.h"
diff --git a/formats/format_g726.c b/formats/format_g726.c
index ffaaa367cb..93e3dc873e 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -32,14 +32,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 5ad16d97e5..003d93473f 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -30,14 +30,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 4bb49eb453..55c65b11b6 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -27,14 +27,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 90fedfb556..09e4d3c4ed 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -28,14 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_h264.c b/formats/format_h264.c
index e2bc36c2ed..05b2624e71 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -28,14 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index f7d37d5578..35278e0b63 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -29,14 +29,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index bb0661074e..8c4c4e3371 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -28,15 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.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>
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 14127588bf..da0ec0ea0e 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -34,15 +34,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.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>
 
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 5c31408e51..05fd02fe6f 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -28,14 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <stdio.h>
+// #include <sys/time.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 8bb369c984..3fe406da3c 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -26,14 +26,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 79cf093dc1..4460b21ea5 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -28,14 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_wav.c b/formats/format_wav.c
index c09c7ed1f2..2abddc2194 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -28,14 +28,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 6916ceaf4c..36a6d4b634 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -31,14 +31,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index daabe621e1..2d86d90e8c 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -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"
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index 30e916d59f..b0a42a4dbb 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -30,10 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 54899352a3..2c7a3fcdd2 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -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"
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 4e7baa0397..5f8cf0febf 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -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"
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 5ed03e31da..7236095a9d 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -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"
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 4e7b44e129..107b607a05 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -38,9 +38,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <curl/curl.h>
 
 #include "asterisk/lock.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index cf19816272..2840fceb93 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -28,11 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_db.c b/funcs/func_db.c
index 49e52bfd0e..c1da3870a1 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -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"
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index 261dd41dd8..950208be5e 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -32,8 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c
index 99ac864bc8..746784ba9d 100644
--- a/funcs/func_dialgroup.c
+++ b/funcs/func_dialgroup.c
@@ -29,10 +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"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 677698cfe9..f47f62fcf8 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -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"
diff --git a/funcs/func_env.c b/funcs/func_env.c
index fea94f20c3..102414b162 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -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"
diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c
index 69c2fe8297..8866d89b9c 100644
--- a/funcs/func_extstate.c
+++ b/funcs/func_extstate.c
@@ -30,8 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_global.c b/funcs/func_global.c
index 39fccca10b..d3a22ebb86 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -29,10 +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"
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index 883920112b..c136743574 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -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"
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index 1bce3c66a0..72d62b227d 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -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>
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 9985f26c59..22339969fb 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -30,10 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index 1ec21eb9ed..bcee8ba321 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -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"
diff --git a/funcs/func_math.c b/funcs/func_math.c
index 70882d1f1a..fe9a078f71 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -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"
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 7e1785d762..8c3f55f515 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -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"
diff --git a/funcs/func_module.c b/funcs/func_module.c
index a2cb5e4187..8f0521a09f 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -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"
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index a2f895b2e8..18869f61ae 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -36,11 +36,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index d989b0ad60..716c803203 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -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"
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index bc9063fe9a..c31d0e0422 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -28,12 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index fa4b73fdae..c6d7912a0e 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -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"
diff --git a/funcs/func_shell.c b/funcs/func_shell.c
index 3acafe25a9..5d2626d1c1 100644
--- a/funcs/func_shell.c
+++ b/funcs/func_shell.c
@@ -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"
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 70ecc4c595..ba7075b6e0 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -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"
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 58b78c167c..2baea1e21f 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -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"
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index 98fad7d5a1..c8ecb7bb32 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -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"
diff --git a/funcs/func_version.c b/funcs/func_version.c
index 7c7ed38020..a42462e7e4 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -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"
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index cde16653f6..cd558d4358 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -29,12 +29,7 @@
 
 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/file.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_volume.c b/funcs/func_volume.c
index aca13fd479..0ac121f15b 100644
--- a/funcs/func_volume.c
+++ b/funcs/func_volume.c
@@ -30,8 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h
index 9342dca828..1bd9dc84dd 100644
--- a/include/asterisk/abstract_jb.h
+++ b/include/asterisk/abstract_jb.h
@@ -30,7 +30,6 @@
 #ifndef _ABSTRACT_JB_H_
 #define _ABSTRACT_JB_H_
 
-#include <stdio.h>
 #include <sys/time.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h
index f1f838ef08..4487c17aa3 100644
--- a/include/asterisk/astmm.h
+++ b/include/asterisk/astmm.h
@@ -27,13 +27,6 @@
 
 #include "asterisk.h"
 
-/* Include these now to prevent them from being needed later */
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 /* Undefine any macros */
 #undef malloc
 #undef calloc
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index 088d6df166..1d257ed7aa 100644
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -23,8 +23,6 @@
 #ifndef _ASTERISK_ASTOBJ_H
 #define _ASTERISK_ASTOBJ_H
 
-#include <string.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/compiler.h"
 
diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h
index d0db49f483..d29917d1d9 100644
--- a/include/asterisk/cli.h
+++ b/include/asterisk/cli.h
@@ -27,8 +27,6 @@
 extern "C" {
 #endif
 
-#include <stdarg.h>
-
 #include "asterisk/linkedlists.h"
 
 void ast_cli(int fd, const char *fmt, ...)
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 838e24e472..7e019e0641 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -11,16 +11,49 @@
 
 /*! \file
  * \brief General Definitions for Asterisk top level program
+ * Included by asterisk.h to handle platform-specific issues
+ * especially those related to header files.
  */
 
 #ifndef _COMPAT_H
 #define _COMPAT_H
 
-#include "asterisk/autoconfig.h"
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
 #include <stdarg.h>
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>	/* not necessarily present - could be in stdlib */
+#endif
+
+#include <stdio.h>	/* this is always present */
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC)
 int asprintf(char **str, const char *fmt, ...);
 #endif
diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index ab67fb22bd..c60916a902 100644
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 #include "asterisk/utils.h"
-#include <stdarg.h>
 
 struct ast_config;
 
diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index a93b58915c..994b7b9435 100644
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -23,13 +23,11 @@
 #ifndef _ASTERISK_FILE_H
 #define _ASTERISK_FILE_H
 
-#ifndef stdin
-#error You must include stdio.h before file.h!
-#endif /* !stdin */
-
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 52164ed036..eb09bbf452 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -46,7 +46,7 @@
 #define _ASTERISK_LOCK_H
 
 #include <pthread.h>
-#include <netdb.h>
+// #include <netdb.h>
 #include <time.h>
 #include <sys/param.h>
 
@@ -99,9 +99,6 @@
 #endif
 
 #include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
 
 #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, 1, { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
 #define AST_MUTEX_INIT_VALUE_NOTRACKING \
diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h
index 2cfc8ecc30..62c970713d 100644
--- a/include/asterisk/logger.h
+++ b/include/asterisk/logger.h
@@ -25,11 +25,8 @@
 #ifndef _ASTERISK_LOGGER_H
 #define _ASTERISK_LOGGER_H
 
-#include "asterisk/compat.h"
 #include "asterisk/options.h"
 
-#include <stdarg.h>
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 47684960cc..cef48ed48f 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -19,8 +19,6 @@
 #ifndef _ASTERISK_MANAGER_H
 #define _ASTERISK_MANAGER_H
 
-#include <stdarg.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/include/asterisk/md5.h b/include/asterisk/md5.h
index f738bd5b62..714267da66 100644
--- a/include/asterisk/md5.h
+++ b/include/asterisk/md5.h
@@ -23,8 +23,6 @@
 #ifndef _ASTERISK_MD5_H
 #define _ASTERISK_MD5_H
 
-#include <inttypes.h>
-
 struct MD5Context {
 	uint32_t buf[4];
 	uint32_t bits[2];
diff --git a/include/asterisk/plc.h b/include/asterisk/plc.h
index 762504952e..cd650012c8 100644
--- a/include/asterisk/plc.h
+++ b/include/asterisk/plc.h
@@ -33,15 +33,7 @@
 #if !defined(_PLC_H_)
 #define _PLC_H_
 
-#ifdef SOLARIS
-#include <sys/int_types.h>
-#else
-#if defined(__OpenBSD__) || defined( __FreeBSD__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-#endif
+/* solaris used to #include <sys/int_types.h> */
 
 /*! \page plc_page Packet loss concealment
 \section plc_page_sec_1 What does it do?
diff --git a/include/asterisk/sha1.h b/include/asterisk/sha1.h
index ed905d04b0..d530c32065 100644
--- a/include/asterisk/sha1.h
+++ b/include/asterisk/sha1.h
@@ -18,15 +18,8 @@
 #ifndef _SHA1_H_
 #define _SHA1_H_
 
-
-
-#if defined(__OpenBSD__) || defined( __FreeBSD__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
 /*
+ * We assume that the standard asterisk headers have been included before this one.
  * If you do not have the ISO standard stdint.h header file, then you
  * must typdef the following:
  *    name              meaning
diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h
index 597d366bf5..603c648c77 100644
--- a/include/asterisk/slinfactory.h
+++ b/include/asterisk/slinfactory.h
@@ -23,9 +23,6 @@
 
 #ifndef _ASTERISK_SLINFACTORY_H
 #define _ASTERISK_SLINFACTORY_H
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index f842601ca9..214935ac0c 100644
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -102,10 +102,6 @@
 #ifndef _ASTERISK_STRINGFIELDS_H
 #define _ASTERISK_STRINGFIELDS_H
 
-#include <string.h>
-#include <stdarg.h>
-#include <stddef.h>
-
 #include "asterisk/inline_api.h"
 #include "asterisk/compiler.h"
 #include "asterisk/compat.h"
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 62df5a36aa..2efe02c2a4 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -23,10 +23,6 @@
 #ifndef _ASTERISK_STRINGS_H
 #define _ASTERISK_STRINGS_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
 #include "asterisk/inline_api.h"
 #include "asterisk/compiler.h"
 #include "asterisk/compat.h"
diff --git a/include/asterisk/time.h b/include/asterisk/time.h
index d041833547..7e1726e727 100644
--- a/include/asterisk/time.h
+++ b/include/asterisk/time.h
@@ -23,8 +23,9 @@
 #ifndef _ASTERISK_TIME_H
 #define _ASTERISK_TIME_H
 
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#include <stdlib.h>
+#endif
 
 #include "asterisk/inline_api.h"
 
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index efde93d59e..7d0b560894 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -25,14 +25,10 @@
 
 #include "asterisk/compat.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>	/* we want to override inet_ntoa */
 #include <netdb.h>
 #include <limits.h>
-#include <string.h>
 #include <time.h>	/* we want to override localtime_r */
 
 #include "asterisk/lock.h"
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index b8ccfbd930..fe2f07aeb8 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -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"
diff --git a/main/acl.c b/main/acl.c
index 110bb51f83..d803290e6c 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -27,9 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/main/adsistub.c b/main/adsistub.c
index 38eaa0efc1..e24b68c91d 100644
--- a/main/adsistub.c
+++ b/main/adsistub.c
@@ -16,9 +16,6 @@
  * at the top of the source tree.
  */
 
-#include <unistd.h>
-#include <stdlib.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/app.c b/main/app.c
index defad777a9..07b442c47e 100644
--- a/main/app.c
+++ b/main/app.c
@@ -27,15 +27,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 <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <regex.h>
diff --git a/main/asterisk.c b/main/asterisk.c
index 7ba306233a..a94972cc5c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -63,11 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #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>
diff --git a/main/astmm.c b/main/astmm.c
index fd0b3d6fa9..7f112c007a 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -29,8 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 #include "asterisk/cli.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index 06396b3a82..67c77423ab 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -27,12 +27,8 @@
 
 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"
diff --git a/main/autoservice.c b/main/autoservice.c
index 7ef5c0a9b7..137b7f22eb 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -27,13 +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 "asterisk/pbx.h"
 #include "asterisk/frame.h"
diff --git a/main/callerid.c b/main/callerid.c
index 4777f1728f..2b1329f3ca 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -28,10 +28,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>
 
diff --git a/main/cdr.c b/main/cdr.c
index 166cfaeda3..77e6c865d4 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -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"
diff --git a/main/channel.c b/main/channel.c
index aac3ad0b8d..524a8ac439 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -27,14 +27,9 @@
 
 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"
diff --git a/main/chanvars.c b/main/chanvars.c
index 858933c922..ad92072f0f 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -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"
diff --git a/main/cli.c b/main/cli.c
index 2cb85e474f..a9f9fc37cf 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -27,12 +27,8 @@
 
 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>
 
diff --git a/main/config.c b/main/config.c
index 27c34ec154..da499acdd5 100644
--- a/main/config.c
+++ b/main/config.c
@@ -30,10 +30,6 @@
 
 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>
diff --git a/main/cryptostub.c b/main/cryptostub.c
index fde6bfeade..05fb39d299 100644
--- a/main/cryptostub.c
+++ b/main/cryptostub.c
@@ -27,9 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <unistd.h>
-#include <stdlib.h>
-
 #include "asterisk/crypto.h"
 #include "asterisk/logger.h"
 
diff --git a/main/db.c b/main/db.c
index 50cba13d46..ab9821d469 100644
--- a/main/db.c
+++ b/main/db.c
@@ -31,13 +31,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 <dirent.h>
 
 #include "asterisk/channel.h"
diff --git a/main/devicestate.c b/main/devicestate.c
index c36fa694c7..c1ea18c5a0 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -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"
diff --git a/main/dial.c b/main/dial.c
index 3d4d3d739e..252aa3c034 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -27,13 +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 "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/main/dlfcn.c b/main/dlfcn.c
index 9a68b5c193..802e7942f1 100644
--- a/main/dlfcn.c
+++ b/main/dlfcn.c
@@ -30,12 +30,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <stdarg.h>
 #include <limits.h>
 #include <mach-o/dyld.h>
 #include <mach-o/nlist.h>
diff --git a/main/dns.c b/main/dns.c
index 05a64c469a..a325796c0d 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -33,12 +33,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
-#include <unistd.h>
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index b4c8e63077..34dc2ebc65 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -27,15 +27,10 @@
 
 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>
 
diff --git a/main/dsp.c b/main/dsp.c
index 4235affa81..8f806a4286 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -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"
diff --git a/main/enum.c b/main/enum.c
index 9397f0f78e..29a32126ce 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -44,7 +44,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
@@ -54,11 +53,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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"
diff --git a/main/event.c b/main/event.c
index 23b16e52c4..f9d9b657c1 100644
--- a/main/event.c
+++ b/main/event.c
@@ -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"
diff --git a/main/file.c b/main/file.c
index de69ab0878..a01fc5829a 100644
--- a/main/file.c
+++ b/main/file.c
@@ -27,15 +27,9 @@
 
 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/frame.h"
diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c
index a9d0f87078..8a885b8e6d 100644
--- a/main/fixedjitterbuf.c
+++ b/main/fixedjitterbuf.c
@@ -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"
diff --git a/main/frame.c b/main/frame.c
index 50e9dabbcf..f756ee23c8 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -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"
diff --git a/main/fskmodem.c b/main/fskmodem.c
index 00ae1c80fa..e590248344 100644
--- a/main/fskmodem.c
+++ b/main/fskmodem.c
@@ -32,8 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-
 #include "asterisk/fskmodem.h"
 
 #define NBW	2
diff --git a/main/hashtab.c b/main/hashtab.c
index 19d642ebe5..789438d206 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -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"
diff --git a/main/http.c b/main/http.c
index d4e692ea65..7271e8523d 100644
--- a/main/http.c
+++ b/main/http.c
@@ -32,12 +32,7 @@
 
 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>
diff --git a/main/image.c b/main/image.c
index f160cebffb..f677aadfa4 100644
--- a/main/image.c
+++ b/main/image.c
@@ -27,14 +27,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
diff --git a/main/indications.c b/main/indications.c
index ebebc682bc..0733a7d6ce 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -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"
diff --git a/main/io.c b/main/io.c
index c4ba3cffb3..df06502f80 100644
--- a/main/io.c
+++ b/main/io.c
@@ -27,11 +27,7 @@
 
 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 "asterisk/io.h"
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 1274886965..81e60cc8a4 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -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"
diff --git a/main/loader.c b/main/loader.c
index b51888dbea..1ac5f9c567 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -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"
diff --git a/main/logger.c b/main/logger.c
index a5c7dd93a4..83cdef36ac 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -30,14 +30,8 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <time.h>
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #if ((defined(AST_DEVMODE)) && (defined(linux)))
diff --git a/main/manager.c b/main/manager.c
index 37885d48de..7708d324f3 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -45,12 +45,8 @@
 
 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>
@@ -58,7 +54,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <arpa/inet.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sys/mman.h>
 
 #include "asterisk/channel.h"
diff --git a/main/md5.c b/main/md5.c
index 949c408e27..594c5eff5b 100644
--- a/main/md5.c
+++ b/main/md5.c
@@ -24,8 +24,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>		/* for memcpy() */
-
 #include "asterisk/endian.h"
 #include "asterisk/md5.h"
 
diff --git a/main/netsock.c b/main/netsock.c
index e57c376eec..b391fc4eee 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -29,13 +29,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>
diff --git a/main/pbx.c b/main/pbx.c
index 6f6ef0de39..5c6bb394ce 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -27,11 +27,6 @@
 
 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>
diff --git a/main/plc.c b/main/plc.c
index 336a990308..ef549ca2ce 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -34,9 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <math.h>
 
 #include "asterisk/plc.h"
diff --git a/main/privacy.c b/main/privacy.c
index b27bb5046b..e52327fc34 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -27,13 +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 <dirent.h>
 
 #include "asterisk/channel.h"
diff --git a/main/rtp.c b/main/rtp.c
index 5ab4eb658d..a6d9c73620 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -30,13 +30,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>
diff --git a/main/say.c b/main/say.c
index 6daabdcf3b..70537c3c2f 100644
--- a/main/say.c
+++ b/main/say.c
@@ -35,14 +35,10 @@
 
 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>
diff --git a/main/sched.c b/main/sched.c
index 986badd163..4e7e55423d 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -36,11 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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"
diff --git a/main/sha1.c b/main/sha1.c
index a58a713852..3a6f7cc6bc 100644
--- a/main/sha1.c
+++ b/main/sha1.c
@@ -60,7 +60,7 @@
  *
  */
 
-
+#include "asterisk/compat.h"
 #include "asterisk/sha1.h"
 
 /*! Define the SHA1 circular left shift macro */
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 038fa0d7bf..73ef6280e0 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -28,8 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-
 #include "asterisk/frame.h"
 #include "asterisk/slinfactory.h"
 #include "asterisk/logger.h"
diff --git a/main/srv.c b/main/srv.c
index 55a13e8526..262be8079d 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -33,7 +33,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #ifdef __APPLE__
@@ -42,9 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #endif
 #endif
 #include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 44607c921a..c132e901c3 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -44,21 +44,18 @@
 
 /*LINTLIBRARY*/
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef DEBUG
-#include <stdio.h>
-#endif
-#include <float.h>
 
-
-#include "private.h"
-#include "tzfile.h"
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <float.h>
+
+#include "private.h"
+#include "tzfile.h"
+
 #include "asterisk/lock.h"
 #include "asterisk/localtime.h"
 #include "asterisk/strings.h"
diff --git a/main/strcompat.c b/main/strcompat.c
index 243ef76cb0..37ee407cd9 100644
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -21,16 +21,7 @@
 
 #include "asterisk.h"
 
-#include <sys/types.h>
 #include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
 
 #ifndef HAVE_STRSEP
 char *strsep(char **str, const char *delims)
diff --git a/main/tdd.c b/main/tdd.c
index 0d1f7fdce6..cb3e2f1d72 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -32,10 +32,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>
 
diff --git a/main/term.c b/main/term.c
index d051338d87..2f679d8987 100644
--- a/main/term.c
+++ b/main/term.c
@@ -27,16 +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 <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include "asterisk/term.h"
 #include "asterisk/options.h"
diff --git a/main/threadstorage.c b/main/threadstorage.c
index a03f3c98b2..5416714966 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -29,10 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "asterisk/logger.h"
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
diff --git a/main/translate.c b/main/translate.c
index aa096436d8..734f369d4d 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -27,14 +27,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/main/udptl.c b/main/udptl.c
index beb76a9884..4b67dc221a 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -50,13 +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>
diff --git a/main/utils.c b/main/utils.c
index d94889188d..d7a04e9b27 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -28,14 +28,8 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index e618264a0d..0d57cf7db8 100644
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -26,15 +26,9 @@
 
 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"
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index e6d1fdc879..95e6a16936 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -30,11 +30,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>
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 0a62da7445..24fa13ee4c 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -27,10 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 611483a374..6f469214d6 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -30,13 +30,9 @@
 
 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>
diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index e1cb6dc5a2..45a951d853 100644
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -31,13 +31,7 @@
 
 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>
 
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index 3221fb65d0..47ac2f856d 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -26,10 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/file.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index c4701b3d0c..d6f24514c7 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -32,9 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/logger.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 0d92fa720b..4ef9ea225f 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -27,10 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include "asterisk/file.h"
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index cac64737a1..46cc44c9b9 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -30,13 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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 "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/res/res_adsi.c b/res/res_adsi.c
index ae166fe127..6a1cc6066d 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -35,10 +35,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 <errno.h>
 
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index daa6a23604..e1fd46718f 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -29,11 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/res/res_agi.c b/res/res_agi.c
index bb591c169d..de84cbee76 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -27,20 +27,14 @@
 
 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>
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 5f2b6ab03d..5ecf0f7823 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -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"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 344633cf29..86c071cdcf 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -38,11 +38,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 6dbeae1469..233fc6a694 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -30,9 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <libpq-fe.h>			/* PostgreSQL */
 
 #include "asterisk/file.h"
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 53987cc9ae..ed01726318 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -84,10 +84,6 @@
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sqlite.h>
 
 #include "asterisk/pbx.h"
diff --git a/res/res_convert.c b/res/res_convert.c
index c91c5e7ee5..c4fc4a6300 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -30,10 +30,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
diff --git a/res/res_crypto.c b/res/res_crypto.c
index e76cab2e84..0b3b16ed2b 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -34,14 +34,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#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/file.h"
diff --git a/res/res_features.c b/res/res_features.c
index 34c5661c01..b0bea0b549 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -28,12 +28,7 @@
 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>
diff --git a/res/res_indications.c b/res/res_indications.c
index ce6227dfc5..49121084b2 100644
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -28,13 +28,8 @@
 
 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/lock.h"
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 6dfcb9a254..b9bfa6c477 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -35,8 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <iksemel.h>
 
 #include "asterisk/channel.h"
diff --git a/res/res_limit.c b/res/res_limit.c
index de2c7da9a6..b8cc175d0b 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -23,11 +23,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #define _XOPEN_SOURCE 600
-#include <string.h>
+
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 3a5aa5914e..e3698167e2 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -27,11 +27,7 @@
 
 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>
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index a1de8ba6b5..dc42b67903 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -34,20 +34,14 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
-#include <unistd.h>
-#include <string.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>
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 8d3a4da0bf..b458d602d4 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -38,11 +38,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/res/res_realtime.c b/res/res_realtime.c
index 49f49c5eb6..0576579997 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -31,11 +31,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index 140241635a..c785f2339b 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -26,8 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <termios.h>
 #include <sys/time.h>
diff --git a/res/res_speech.c b/res/res_speech.c
index 27b1d3235c..958bd8171f 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -27,11 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 8955aa045b..0e82e2b010 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -1,8 +1,3 @@
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
 #include <locale.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/utils/hashtest.c b/utils/hashtest.c
index 18dc713f46..dec2e7cd5a 100644
--- a/utils/hashtest.c
+++ b/utils/hashtest.c
@@ -31,19 +31,10 @@
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <string.h>
 #include <pthread.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include "asterisk/lock.h"
 #include "asterisk/hashtab.h"
 #include "asterisk/channel.h"
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index aaaeb06a37..956453c073 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -32,19 +32,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <string.h>
 #include <pthread.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "asterisk/compat.h"
 #include "asterisk/lock.h"