aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/app_adsiprog.c5
-rw-r--r--apps/app_alarmreceiver.c4
-rw-r--r--apps/app_amd.c3
-rw-r--r--apps/app_authenticate.c4
-rw-r--r--apps/app_cdr.c3
-rw-r--r--apps/app_chanisavail.c4
-rw-r--r--apps/app_channelredirect.c5
-rw-r--r--apps/app_chanspy.c4
-rw-r--r--apps/app_controlplayback.c4
-rw-r--r--apps/app_db.c6
-rw-r--r--apps/app_dial.c4
-rw-r--r--apps/app_dictate.c4
-rw-r--r--apps/app_directed_pickup.c5
-rw-r--r--apps/app_directory.c3
-rw-r--r--apps/app_disa.c3
-rw-r--r--apps/app_dumpchan.c5
-rw-r--r--apps/app_echo.c5
-rw-r--r--apps/app_exec.c5
-rw-r--r--apps/app_externalivr.c4
-rw-r--r--apps/app_festival.c6
-rw-r--r--apps/app_flash.c3
-rw-r--r--apps/app_followme.c4
-rw-r--r--apps/app_forkcdr.c5
-rw-r--r--apps/app_getcpeid.c5
-rw-r--r--apps/app_ices.c4
-rw-r--r--apps/app_image.c4
-rw-r--r--apps/app_ivrdemo.c5
-rw-r--r--apps/app_macro.c6
-rw-r--r--apps/app_meetme.c4
-rw-r--r--apps/app_milliwatt.c4
-rw-r--r--apps/app_minivm.c12
-rw-r--r--apps/app_mixmonitor.c5
-rw-r--r--apps/app_morsecode.c5
-rw-r--r--apps/app_mp3.c6
-rw-r--r--apps/app_nbscat.c6
-rw-r--r--apps/app_osplookup.c4
-rw-r--r--apps/app_page.c4
-rw-r--r--apps/app_parkandannounce.c6
-rw-r--r--apps/app_playback.c4
-rw-r--r--apps/app_privacy.c4
-rw-r--r--apps/app_queue.c5
-rw-r--r--apps/app_read.c4
-rw-r--r--apps/app_readexten.c4
-rw-r--r--apps/app_readfile.c5
-rw-r--r--apps/app_record.c4
-rw-r--r--apps/app_rpt.c5
-rw-r--r--apps/app_sayunixtime.c5
-rw-r--r--apps/app_senddtmf.c4
-rw-r--r--apps/app_sendtext.c4
-rw-r--r--apps/app_setcallerid.c4
-rw-r--r--apps/app_skel.c5
-rw-r--r--apps/app_sms.c5
-rw-r--r--apps/app_softhangup.c6
-rw-r--r--apps/app_speech_utils.c5
-rw-r--r--apps/app_stack.c5
-rw-r--r--apps/app_system.c4
-rw-r--r--apps/app_talkdetect.c4
-rw-r--r--apps/app_test.c5
-rw-r--r--apps/app_transfer.c5
-rw-r--r--apps/app_url.c4
-rw-r--r--apps/app_userevent.c5
-rw-r--r--apps/app_verbose.c5
-rw-r--r--apps/app_voicemail.c5
-rw-r--r--apps/app_waitforring.c6
-rw-r--r--apps/app_waitforsilence.c5
-rw-r--r--apps/app_while.c5
-rw-r--r--apps/app_zapateller.c4
-rw-r--r--apps/app_zapbarge.c4
-rw-r--r--apps/app_zapras.c4
-rw-r--r--apps/app_zapscan.c4
70 files changed, 6 insertions, 319 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 23af16897..75cb3ae09 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 194a33237..6c7a0a41f 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 a33bb7217..fbf23c9de 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 8533f151d..040925738 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 8497405a6..8ef10ba97 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 b5c273690..2cf79138d 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 6df4cb8d1..c446d277b 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 c30a427a2..4061ac91d 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 18b8d4327..dc3e112fc 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 573ecb4ae..777d20150 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 42a624de3..00fe86bc3 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 812e579b8..db518788f 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 e5c6af307..390e5b01a 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 010899d37..d316f1a6a 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 3756c3d5e..cffca0ff0 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 ecffe488e..156109185 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 1420131df..44e6f0981 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 6a13e1801..3513b3b2a 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 2ebaead0c..3774c8ad8 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 835cedeaf..5b2f85cd0 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 45b0fc3d3..d1d33ebf3 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 c5a5723ac..dee42c2be 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 e18a6009e..cc1872c7a 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 37ee66bca..7cbf986f6 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 fe900ef4a..a015b0d5b 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 302c3ac39..875f2a617 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 3ac80cbb4..2e7cb05c4 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 47bc42b25..37b7a0aea 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 8d875e99c..0587d7379 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 022eb6f3b..63ce6f9f6 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 1bca5a333..d2c2abe6d 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 9c8ba0b35..c30a737cd 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 c8283948d..08a4ec844 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 7dc2d4cf1..3243713a7 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 6c9097cc1..e076dea84 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 aa65257e6..13e43ea95 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 bc701f5ee..e2e7472a1 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 51841d8d3..c13ea5ad7 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 ea091a9d1..1b7cf1f75 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 e470b9ed0..02bae7302 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 e55926819..3ceecb72f 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 4422cb157..32e9202be 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 cfb8f09cf..fbff8833a 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 d1bedcbce..2ea9fb592 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 83d4000fd..273b702b4 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 14831eb07..0b149c68a 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 0c433cdbf..006782496 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 f1bfee9bf..a1626853d 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 6a9cd30b0..01a2dea29 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 6a236a0cd..3b542fb3e 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 527fc776d..518da5073 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 b1cbfbb71..12acdb747 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 ee6c92a05..4c22cc27e 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 693546afc..1a4cf23ba 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 753048f37..dac03125d 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 ded110cae..2e22b3753 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 415bc0a2d..48ac4dd8d 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 ae49fa296..b2a840647 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 a6359a6d4..1309d9d62 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 e32957a6e..1d505cddd 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 8b61b6d2f..44bf2e0bf 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 97e441afc..80af80284 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 5fb1b8449..c140a635d 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 b7064c115..e66a94182 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 f2adbf23f..265d4639e 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 7569ccd17..bb3956a1f 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 3d665795c..c3467e1c7 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 db7ffbc9c..2c321b692 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 cdbdc5a89..a15f0c2b2 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 343c47da6..95721b871 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"