From 883346d64a852193fb4119d4399aa0f5a54d8ae8 Mon Sep 17 00:00:00 2001 From: rizzo Date: Fri, 16 Nov 2007 20:04:58 +0000 Subject: Start untangling header inclusion in a way that does not affect build times - tested, there is no measureable difference before and after this commit. In this change: use asterisk/compat.h to include a small set of system headers: inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h, stdlib.h, alloca.h, stdio.h Where available, the inclusion is conditional on HAVE_FOO_H as determined by autoconf. Normally, source files should not include any of the above system headers, and instead use either "asterisk.h" or "asterisk/compat.h" which does it better. For the time being I have left alone second-level directories (main/db1-ast, etc.). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89333 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile.rules | 2 +- apps/app_adsiprog.c | 5 ----- apps/app_alarmreceiver.c | 4 ---- apps/app_amd.c | 3 --- apps/app_authenticate.c | 4 ---- apps/app_cdr.c | 3 --- apps/app_chanisavail.c | 4 ---- apps/app_channelredirect.c | 5 ----- apps/app_chanspy.c | 4 ---- apps/app_controlplayback.c | 4 ---- apps/app_db.c | 6 ------ apps/app_dial.c | 4 ---- apps/app_dictate.c | 4 ---- apps/app_directed_pickup.c | 5 ----- apps/app_directory.c | 3 --- apps/app_disa.c | 3 --- apps/app_dumpchan.c | 5 ----- apps/app_echo.c | 5 ----- apps/app_exec.c | 5 ----- apps/app_externalivr.c | 4 ---- apps/app_festival.c | 6 ------ apps/app_flash.c | 3 --- apps/app_followme.c | 4 ---- apps/app_forkcdr.c | 5 ----- apps/app_getcpeid.c | 5 ----- apps/app_ices.c | 4 ---- apps/app_image.c | 4 ---- apps/app_ivrdemo.c | 5 ----- apps/app_macro.c | 6 ------ apps/app_meetme.c | 4 ---- apps/app_milliwatt.c | 4 ---- apps/app_minivm.c | 12 ++++-------- apps/app_mixmonitor.c | 5 ----- apps/app_morsecode.c | 5 ----- apps/app_mp3.c | 6 +----- apps/app_nbscat.c | 6 +----- apps/app_osplookup.c | 4 ---- apps/app_page.c | 4 ---- apps/app_parkandannounce.c | 6 ------ apps/app_playback.c | 4 ---- apps/app_privacy.c | 4 ---- apps/app_queue.c | 5 ----- apps/app_read.c | 4 ---- apps/app_readexten.c | 4 ---- apps/app_readfile.c | 5 ----- apps/app_record.c | 4 ---- apps/app_rpt.c | 5 ----- apps/app_sayunixtime.c | 5 ----- apps/app_senddtmf.c | 4 ---- apps/app_sendtext.c | 4 ---- apps/app_setcallerid.c | 4 ---- apps/app_skel.c | 5 ----- apps/app_sms.c | 5 ----- apps/app_softhangup.c | 6 ------ apps/app_speech_utils.c | 5 ----- apps/app_stack.c | 5 ----- apps/app_system.c | 4 ---- apps/app_talkdetect.c | 4 ---- apps/app_test.c | 5 ----- apps/app_transfer.c | 5 ----- apps/app_url.c | 4 ---- apps/app_userevent.c | 5 ----- apps/app_verbose.c | 5 ----- apps/app_voicemail.c | 5 ----- apps/app_waitforring.c | 6 ------ apps/app_waitforsilence.c | 5 ----- apps/app_while.c | 5 ----- apps/app_zapateller.c | 4 ---- apps/app_zapbarge.c | 4 ---- apps/app_zapras.c | 4 ---- apps/app_zapscan.c | 4 ---- cdr/cdr_adaptive_odbc.c | 4 ---- cdr/cdr_csv.c | 6 ------ cdr/cdr_custom.c | 6 ------ cdr/cdr_manager.c | 3 --- cdr/cdr_odbc.c | 6 ------ cdr/cdr_pgsql.c | 5 ----- cdr/cdr_radius.c | 5 ----- cdr/cdr_sqlite.c | 5 ----- cdr/cdr_sqlite3_custom.c | 5 ----- cdr/cdr_tds.c | 5 ----- channels/chan_agent.c | 4 ---- channels/chan_alsa.c | 4 ---- channels/chan_features.c | 4 ---- channels/chan_gtalk.c | 5 ----- channels/chan_h323.c | 4 ---- channels/chan_iax2.c | 5 ----- channels/chan_jingle.c | 4 ---- channels/chan_local.c | 4 ---- channels/chan_mgcp.c | 4 ---- channels/chan_misdn.c | 4 ---- channels/chan_nbs.c | 4 ---- channels/chan_oss.c | 4 ---- channels/chan_phone.c | 4 ---- channels/chan_sip.c | 4 ---- channels/chan_skinny.c | 4 ---- channels/chan_unistim.c | 4 ---- channels/chan_usbradio.c | 4 ---- channels/chan_vpb.cc | 5 ----- channels/chan_zap.c | 7 ------- channels/iax2-parser.c | 5 ----- channels/iax2-provision.c | 4 ---- channels/misdn_config.c | 3 --- codecs/codec_a_mu.c | 4 ---- codecs/codec_adpcm.c | 4 ---- codecs/codec_alaw.c | 4 ---- codecs/codec_g722.c | 4 ---- codecs/codec_g726.c | 4 ---- codecs/codec_gsm.c | 4 ---- codecs/codec_ilbc.c | 4 ---- codecs/codec_lpc10.c | 4 ---- codecs/codec_speex.c | 4 ---- codecs/codec_ulaw.c | 4 ---- codecs/codec_zap.c | 4 ---- formats/format_g723.c | 4 ---- formats/format_g726.c | 4 ---- formats/format_g729.c | 4 ---- formats/format_gsm.c | 4 ---- formats/format_h263.c | 4 ---- formats/format_h264.c | 4 ---- formats/format_ilbc.c | 4 ---- formats/format_jpeg.c | 5 ----- formats/format_ogg_vorbis.c | 5 ----- formats/format_pcm.c | 6 +----- formats/format_sln.c | 4 ---- formats/format_vox.c | 4 ---- formats/format_wav.c | 4 ---- formats/format_wav_gsm.c | 4 ---- funcs/func_base64.c | 5 ----- funcs/func_blacklist.c | 4 ---- funcs/func_callerid.c | 5 ----- funcs/func_cdr.c | 5 ----- funcs/func_channel.c | 5 ----- funcs/func_curl.c | 3 --- funcs/func_cut.c | 5 ----- funcs/func_db.c | 4 ---- funcs/func_devstate.c | 2 -- funcs/func_dialgroup.c | 4 ---- funcs/func_enum.c | 3 --- funcs/func_env.c | 4 ---- funcs/func_extstate.c | 2 -- funcs/func_global.c | 4 ---- funcs/func_groupcount.c | 5 ----- funcs/func_iconv.c | 4 ---- funcs/func_lock.c | 4 ---- funcs/func_logic.c | 5 ----- funcs/func_math.c | 4 ---- funcs/func_md5.c | 5 ----- funcs/func_module.c | 4 ---- funcs/func_odbc.c | 5 ----- funcs/func_rand.c | 5 ----- funcs/func_realtime.c | 6 ------ funcs/func_sha1.c | 5 ----- funcs/func_shell.c | 5 ----- funcs/func_strings.c | 4 ---- funcs/func_timeout.c | 5 ----- funcs/func_uri.c | 5 ----- funcs/func_version.c | 5 ----- funcs/func_vmcount.c | 5 ----- funcs/func_volume.c | 2 -- include/asterisk/abstract_jb.h | 1 - include/asterisk/astmm.h | 7 ------- include/asterisk/astobj.h | 2 -- include/asterisk/cli.h | 2 -- include/asterisk/compat.h | 35 ++++++++++++++++++++++++++++++++++- include/asterisk/config.h | 1 - include/asterisk/file.h | 6 ++---- include/asterisk/lock.h | 5 +---- include/asterisk/logger.h | 3 --- include/asterisk/manager.h | 2 -- include/asterisk/md5.h | 2 -- include/asterisk/plc.h | 10 +--------- include/asterisk/sha1.h | 9 +-------- include/asterisk/slinfactory.h | 3 --- include/asterisk/stringfields.h | 4 ---- include/asterisk/strings.h | 4 ---- include/asterisk/time.h | 3 ++- include/asterisk/utils.h | 4 ---- main/abstract_jb.c | 3 --- main/acl.c | 3 --- main/adsistub.c | 3 --- main/app.c | 5 ----- main/asterisk.c | 3 --- main/astmm.c | 2 -- main/audiohook.c | 4 ---- main/autoservice.c | 4 ---- main/callerid.c | 4 ---- main/cdr.c | 4 ---- main/channel.c | 5 ----- main/chanvars.c | 4 ---- main/cli.c | 4 ---- main/config.c | 4 ---- main/cryptostub.c | 3 --- main/db.c | 4 ---- main/devicestate.c | 6 ------ main/dial.c | 4 ---- main/dlfcn.c | 5 ----- main/dns.c | 2 -- main/dnsmgr.c | 5 ----- main/dsp.c | 5 ----- main/enum.c | 4 ---- main/event.c | 3 --- main/file.c | 6 ------ main/fixedjitterbuf.c | 4 ---- main/frame.c | 4 ---- main/fskmodem.c | 2 -- main/hashtab.c | 5 ----- main/http.c | 5 ----- main/image.c | 4 ---- main/indications.c | 3 --- main/io.c | 4 ---- main/jitterbuf.c | 5 ----- main/loader.c | 4 ---- main/logger.c | 6 ------ main/manager.c | 5 ----- main/md5.c | 2 -- main/netsock.c | 4 ---- main/pbx.c | 5 ----- main/plc.c | 3 --- main/privacy.c | 4 ---- main/rtp.c | 4 ---- main/say.c | 4 ---- main/sched.c | 4 ---- main/sha1.c | 2 +- main/slinfactory.c | 2 -- main/srv.c | 4 ---- main/stdtime/localtime.c | 13 +++++-------- main/strcompat.c | 9 --------- main/tdd.c | 4 ---- main/term.c | 5 ----- main/threadstorage.c | 4 ---- main/translate.c | 5 ----- main/udptl.c | 4 ---- main/utils.c | 6 ------ pbx/dundi-parser.c | 6 ------ pbx/pbx_ael.c | 5 ----- pbx/pbx_config.c | 4 ---- pbx/pbx_dundi.c | 4 ---- pbx/pbx_gtkconsole.c | 6 ------ pbx/pbx_loopback.c | 4 ---- pbx/pbx_lua.c | 3 --- pbx/pbx_realtime.c | 4 ---- pbx/pbx_spool.c | 6 ------ res/res_adsi.c | 4 ---- res/res_ael_share.c | 5 ----- res/res_agi.c | 6 ------ res/res_clioriginate.c | 4 ---- res/res_config_odbc.c | 5 ----- res/res_config_pgsql.c | 3 --- res/res_config_sqlite.c | 4 ---- res/res_convert.c | 4 ---- res/res_crypto.c | 4 ---- res/res_features.c | 5 ----- res/res_indications.c | 5 ----- res/res_jabber.c | 2 -- res/res_limit.c | 5 +---- res/res_monitor.c | 4 ---- res/res_musiconhold.c | 6 ------ res/res_odbc.c | 5 ----- res/res_realtime.c | 5 ----- res/res_smdi.c | 2 -- res/res_speech.c | 5 ----- utils/ael_main.c | 5 ----- utils/hashtest.c | 9 --------- utils/hashtest2.c | 9 --------- 265 files changed, 56 insertions(+), 1146 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 2851d2f9f..b71c5d2b9 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 23af16897..75cb3ae09 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -33,13 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include -#include -#include #include -#include #include #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 -#include -#include #include #include -#include #include #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 -#include - #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 -#include -#include #include -#include #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 -#include - #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 -#include -#include -#include #include #include 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 -#include -#include -#include - #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 -#include -#include -#include #include #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 -#include -#include - #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 -#include -#include -#include -#include - #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 #include -#include -#include -#include #include #include #include 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 -#include -#include -#include #include #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 -#include -#include -#include - #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 #include -#include -#include #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 -#include -#include #include #include 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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include #include #include 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 -#include -#include -#include -#include #include #include #include #include -#include #include #include #include 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 -#include -#include #include #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 -#include -#include -#include #include #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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include #include -#include -#include #include #include #include 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 -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include -#include - #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 -#include -#include -#include #include #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 -#include -#include -#include #include #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 +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include -#include -#include -#include #include #include #include -#include #include #include #include #include -#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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include -#include #include #include +#include #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 -#include -#include -#include -#include #include #include #include +#include #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 -#include -#include -#include #include #include #include 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 -#include -#include -#include #include #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 -#include -#include -#include -#include - #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 -#include -#include - #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 -#include -#include - #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 #include -#include -#include -#include -#include #include #include #include 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 -#include -#include - #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 -#include -#include - #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 -#include -#include -#include - #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 -#include -#include - #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 -#include -#include -#include -#include #include -#include #include #include #include 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 -#include -#include -#include - #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 -#include -#include - #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 -#include -#include - #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 -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include #include #include #include -#include #include #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 -#include -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include #include #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 -#include -#include - #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 -#include -#include -#include #include -#include #include #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 -#include -#include -#include - #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 -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include - #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 #include -#include -#include -#include #include #include -#include #include #include #include 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 -#include -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include -#include - #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 -#include -#include - #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 -#include -#include -#include #include #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 #endif /* __linux__ */ -#include -#include -#include #include -#include #include #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 -#include -#include -#include #include #include "asterisk/zapata.h" diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index 129ae1682..b5b83cd02 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -33,10 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include -#include #include #include diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index 1a0fcaa30..2db2221b0 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -32,13 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include - -#include -#include #include #include "asterisk/config.h" diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index fe65abd8c..d84746eb5 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -34,13 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include - -#include -#include #include #include "asterisk/channel.h" diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 062718039..e204337d5 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -29,9 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/channel.h" diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index 1223347b3..effa61512 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -37,12 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - -#include -#include #include #include "asterisk/config.h" diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index ac43e96f8..0750a2dab 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -41,11 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index 207e24762..cc7709016 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -34,13 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Rev$") -#include -#include -#include #include -#include #include -#include #include #include "asterisk/channel.h" diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index 2c526a60c..b08ce164d 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -42,11 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include "asterisk/channel.h" diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index a3ca00a4e..8f87620ed 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/cdr/cdr_sqlite3_custom.c @@ -40,13 +40,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include -#include #include -#include #include #include "asterisk/channel.h" diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 4acd5359e..64faef59c 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 -#include -#include -#include -#include #include #include diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 99462e78d..5f6fc2933 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -35,12 +35,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include #include -#include #include #include #include diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index fefde1eb1..282dd0cf4 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -35,14 +35,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include -#include -#include -#include #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 98e14c0af..6bb9bbe4c 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -34,12 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include -#include #include #include #include diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 6f106bde9..2c72c78d4 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -35,13 +35,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include -#include #include #include #include diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 735fde2c2..457a8a94f 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -59,11 +59,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include -#include #include -#include -#include #include #include diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index ce533a250..c50ac1396 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -37,9 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include @@ -50,10 +47,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include -#include #include #include #include diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 16d906c91..48e1c5e03 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -37,10 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/channels/chan_local.c b/channels/chan_local.c index e79057ee4..b6062cd66 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -29,12 +29,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include -#include #include #include #include diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index b0b138a00..3984ae978 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -32,14 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include #include -#include #include #include #include diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 9d43309aa..02a8559b8 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -38,14 +38,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include #include #include #include -#include -#include #include #include #include diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index d2718b3de..1712942d4 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -33,13 +33,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include #include #include -#include -#include #include #include #include diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 64f64dfa4..cc65f4738 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -40,15 +40,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include -#include #include #include #include -#include #include #ifdef __linux diff --git a/channels/chan_phone.c b/channels/chan_phone.c index d657920c3..faec92c4d 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -33,14 +33,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include #include #include #include -#include -#include #include #include #include diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fc5265936..6a057d315 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -87,15 +87,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include -#include #include #include #include #include -#include #include #include #include diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index fd1dcb412..105e6ce07 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index f96eb360c..4cc0b9eb9 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -36,15 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include #include #include -#include #include #include #include diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index fc77b73e3..47952c560 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -42,15 +42,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include -#include #include #include #include -#include #include #include #include diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 852872714..bf4ef0ff7 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -39,9 +39,6 @@ extern "C" { ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/channel.h" @@ -59,8 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include -#include #include #include #include diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 2ea37472c..b619be123 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #ifdef __NetBSD__ #include #include @@ -59,11 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #endif #include -#include -#if !defined(SOLARIS) && !defined(__FreeBSD__) -#include -#endif -#include #include #include #include diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index a2ec42508..a86bf7428 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -27,14 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include #include #include -#include -#include -#include #include "asterisk/frame.h" #include "asterisk/utils.h" diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index 8e22e88d5..5c0f93240 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -27,10 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 12b299343..2bd7ef9a8 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -30,9 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "chan_misdn_config.h" diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index 40e14ca5e..8cf89b68a 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index a40bbbc9f..c63544b77 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -33,10 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index f4436d162..c7a85feb2 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 54802dc8b..38014dabe 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -32,10 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index 183c4a9e4..9ef79add7 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -33,10 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index 3fbcf9c8e..99b5322d0 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -35,11 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include #include -#include -#include #include "asterisk/lock.h" #include "asterisk/translate.h" diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index ea84eded3..5caec75f5 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -30,11 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include #include -#include -#include #include "asterisk/lock.h" #include "asterisk/translate.h" diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index ca4964336..bee74ddf9 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -32,11 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include #include -#include -#include #include "asterisk/lock.h" #include "asterisk/translate.h" diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index bbb6be238..205349056 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -39,11 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include #include -#include -#include #include /* 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 b10054f3e..47c0b8a93 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c index 11e18600a..31c84438a 100644 --- a/codecs/codec_zap.c +++ b/codecs/codec_zap.c @@ -36,11 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include #include -#include -#include #include #include #include diff --git a/formats/format_g723.c b/formats/format_g723.c index 64883fe88..9a9f1af30 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -29,13 +29,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include -#include #include -#include #include #include "asterisk/lock.h" diff --git a/formats/format_g726.c b/formats/format_g726.c index ffaaa367c..93e3dc873 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -32,14 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/options.h" diff --git a/formats/format_g729.c b/formats/format_g729.c index 5ad16d97e..003d93473 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -30,14 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 4bb49eb45..55c65b11b 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -27,14 +27,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_h263.c b/formats/format_h263.c index 90fedfb55..09e4d3c4e 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -28,14 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_h264.c b/formats/format_h264.c index e2bc36c2e..05b2624e7 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -28,14 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index f7d37d557..35278e0b6 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -29,14 +29,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index bb0661074..8c4c4e337 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -28,15 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include -#include #include -#include #include "asterisk/channel.h" #include "asterisk/file.h" diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 14127588b..da0ec0ea0 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -34,15 +34,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include -#include #include -#include #include #include diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 5c31408e5..05fd02fe6 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -28,14 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include -#include -#include +// #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_sln.c b/formats/format_sln.c index 8bb369c98..3fe406da3 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -26,14 +26,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_vox.c b/formats/format_vox.c index 79cf093dc..4460b21ea 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -28,14 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_wav.c b/formats/format_wav.c index c09c7ed1f..2abddc219 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -28,14 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 6916ceaf4..36a6d4b63 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -31,14 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/funcs/func_base64.c b/funcs/func_base64.c index daabe621e..2d86d90e8 100644 --- a/funcs/func_base64.c +++ b/funcs/func_base64.c @@ -26,11 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 30e916d59..b0a42a4db 100644 --- a/funcs/func_blacklist.c +++ b/funcs/func_blacklist.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #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 54899352a..2c7a3fcdd 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -25,11 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 4e7baa039..5f8cf0feb 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -29,11 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 5ed03e31d..7236095a9 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -27,11 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 4e7b44e12..107b607a0 100644 --- a/funcs/func_curl.c +++ b/funcs/func_curl.c @@ -38,9 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/lock.h" diff --git a/funcs/func_cut.c b/funcs/func_cut.c index cf1981627..2840fceb9 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 49e52bfd0..c1da3870a 100644 --- a/funcs/func_db.c +++ b/funcs/func_db.c @@ -31,10 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c index 261dd41dd..950208be5 100644 --- a/funcs/func_devstate.c +++ b/funcs/func_devstate.c @@ -32,8 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #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 99ac864bc..746784ba9 100644 --- a/funcs/func_dialgroup.c +++ b/funcs/func_dialgroup.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 677698cfe..f47f62fcf 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -37,9 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #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 fea94f20c..102414b16 100644 --- a/funcs/func_env.c +++ b/funcs/func_env.c @@ -25,10 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c index 69c2fe829..8866d89b9 100644 --- a/funcs/func_extstate.c +++ b/funcs/func_extstate.c @@ -30,8 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #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 39fccca10..d3a22ebb8 100644 --- a/funcs/func_global.c +++ b/funcs/func_global.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 883920112..c13674357 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -25,11 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 1bce3c66a..72d62b227 100644 --- a/funcs/func_iconv.c +++ b/funcs/func_iconv.c @@ -31,10 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/funcs/func_lock.c b/funcs/func_lock.c index 9985f26c5..22339969f 100644 --- a/funcs/func_lock.c +++ b/funcs/func_lock.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #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 1ec21eb9e..bcee8ba32 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 70882d1f1..fe9a078f7 100644 --- a/funcs/func_math.c +++ b/funcs/func_math.c @@ -30,11 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include -#include #include "asterisk/module.h" #include "asterisk/channel.h" diff --git a/funcs/func_md5.c b/funcs/func_md5.c index 7e1785d76..8c3f55f51 100644 --- a/funcs/func_md5.c +++ b/funcs/func_md5.c @@ -30,11 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 a2cb5e418..8f0521a09 100644 --- a/funcs/func_module.c +++ b/funcs/func_module.c @@ -25,10 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index a2f895b2e..18869f61a 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -36,11 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_rand.c b/funcs/func_rand.c index d989b0ad6..716c80320 100644 --- a/funcs/func_rand.c +++ b/funcs/func_rand.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 bc9063fe9..c31d0e042 100644 --- a/funcs/func_realtime.c +++ b/funcs/func_realtime.c @@ -28,12 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include - #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 fa4b73fda..c6d7912a0 100644 --- a/funcs/func_sha1.c +++ b/funcs/func_sha1.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 3acafe25a..5d2626d1c 100644 --- a/funcs/func_shell.c +++ b/funcs/func_shell.c @@ -29,11 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 70ecc4c59..ba7075b6e 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 58b78c167..2baea1e21 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 98fad7d5a..c8ecb7bb3 100644 --- a/funcs/func_uri.c +++ b/funcs/func_uri.c @@ -32,11 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 7c7ed3802..a42462e7e 100644 --- a/funcs/func_version.c +++ b/funcs/func_version.c @@ -26,11 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 cde16653f..cd558d435 100644 --- a/funcs/func_vmcount.c +++ b/funcs/func_vmcount.c @@ -29,12 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include -#include #include "asterisk/file.h" #include "asterisk/channel.h" diff --git a/funcs/func_volume.c b/funcs/func_volume.c index aca13fd47..0ac121f15 100644 --- a/funcs/func_volume.c +++ b/funcs/func_volume.c @@ -30,8 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #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 9342dca82..1bd9dc84d 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 #include #if defined(__cplusplus) || defined(c_plusplus) diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index f1f838ef0..4487c17aa 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 -#include -#include -#include -#include - /* Undefine any macros */ #undef malloc #undef calloc diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h index 088d6df16..1d257ed7a 100644 --- a/include/asterisk/astobj.h +++ b/include/asterisk/astobj.h @@ -23,8 +23,6 @@ #ifndef _ASTERISK_ASTOBJ_H #define _ASTERISK_ASTOBJ_H -#include - #include "asterisk/lock.h" #include "asterisk/compiler.h" diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index d0db49f48..d29917d1d 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -27,8 +27,6 @@ extern "C" { #endif -#include - #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 838e24e47..7e019e064 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 +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif + +#ifdef HAVE_STDDEF_H +#include +#endif + +#ifdef HAVE_STDINT_H +#include +#endif + +#ifdef HAVE_SYS_TYPES_H #include +#endif + #include +#ifdef HAVE_STDLIB_H +#include +#endif + +#ifdef HAVE_ALLOCA_H +#include /* not necessarily present - could be in stdlib */ +#endif + +#include /* this is always present */ + +#ifdef HAVE_STRING_H +#include +#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 ab67fb22b..c60916a90 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -28,7 +28,6 @@ extern "C" { #endif #include "asterisk/utils.h" -#include struct ast_config; diff --git a/include/asterisk/file.h b/include/asterisk/file.h index a93b58915..994b7b943 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 +#endif #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 52164ed03..eb09bbf45 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -46,7 +46,7 @@ #define _ASTERISK_LOCK_H #include -#include +// #include #include #include @@ -99,9 +99,6 @@ #endif #include -#include -#include -#include #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 2cfc8ecc3..62c970713 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 - #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 47684960c..cef48ed48 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -19,8 +19,6 @@ #ifndef _ASTERISK_MANAGER_H #define _ASTERISK_MANAGER_H -#include -#include #include #include #include diff --git a/include/asterisk/md5.h b/include/asterisk/md5.h index f738bd5b6..714267da6 100644 --- a/include/asterisk/md5.h +++ b/include/asterisk/md5.h @@ -23,8 +23,6 @@ #ifndef _ASTERISK_MD5_H #define _ASTERISK_MD5_H -#include - struct MD5Context { uint32_t buf[4]; uint32_t bits[2]; diff --git a/include/asterisk/plc.h b/include/asterisk/plc.h index 762504952..cd650012c 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 -#else -#if defined(__OpenBSD__) || defined( __FreeBSD__) -#include -#else -#include -#endif -#endif +/* solaris used to #include */ /*! \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 ed905d04b..d530c3206 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 -#else -#include -#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 597d366bf..603c648c7 100644 --- a/include/asterisk/slinfactory.h +++ b/include/asterisk/slinfactory.h @@ -23,9 +23,6 @@ #ifndef _ASTERISK_SLINFACTORY_H #define _ASTERISK_SLINFACTORY_H -#include -#include -#include #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index f842601ca..214935ac0 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -102,10 +102,6 @@ #ifndef _ASTERISK_STRINGFIELDS_H #define _ASTERISK_STRINGFIELDS_H -#include -#include -#include - #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 62df5a36a..2efe02c2a 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -23,10 +23,6 @@ #ifndef _ASTERISK_STRINGS_H #define _ASTERISK_STRINGS_H -#include -#include -#include - #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 d04183354..7e1726e72 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 -#include +#endif #include "asterisk/inline_api.h" diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index efde93d59..7d0b56089 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -25,14 +25,10 @@ #include "asterisk/compat.h" -#include -#include -#include #include #include /* we want to override inet_ntoa */ #include #include -#include #include /* we want to override localtime_r */ #include "asterisk/lock.h" diff --git a/main/abstract_jb.c b/main/abstract_jb.c index b8ccfbd93..fe2f07aeb 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -31,9 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #include "asterisk/frame.h" #include "asterisk/channel.h" #include "asterisk/logger.h" diff --git a/main/acl.c b/main/acl.c index 110bb51f8..d803290e6 100644 --- a/main/acl.c +++ b/main/acl.c @@ -27,9 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include diff --git a/main/adsistub.c b/main/adsistub.c index 38eaa0efc..e24b68c91 100644 --- a/main/adsistub.c +++ b/main/adsistub.c @@ -16,9 +16,6 @@ * at the top of the source tree. */ -#include -#include - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/main/app.c b/main/app.c index defad777a..07b442c47 100644 --- a/main/app.c +++ b/main/app.c @@ -27,15 +27,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include -#include #include #include #include diff --git a/main/asterisk.c b/main/asterisk.c index 7ba306233..a94972cc5 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -63,11 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #undef sched_setscheduler #undef setpriority -#include -#include #include #include -#include #include #include #include diff --git a/main/astmm.c b/main/astmm.c index fd0b3d6fa..7f112c007 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -29,8 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include #include "asterisk/cli.h" diff --git a/main/audiohook.c b/main/audiohook.c index 06396b3a8..67c77423a 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -27,12 +27,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include -#include #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/main/autoservice.c b/main/autoservice.c index 7ef5c0a9b..137b7f22e 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -27,13 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include "asterisk/pbx.h" #include "asterisk/frame.h" diff --git a/main/callerid.c b/main/callerid.c index 4777f1728..2b1329f3c 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -28,10 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include -#include #include #include diff --git a/main/cdr.c b/main/cdr.c index 166cfaeda..77e6c865d 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -35,10 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/lock.h" diff --git a/main/channel.c b/main/channel.c index aac3ad0b8..524a8ac43 100644 --- a/main/channel.c +++ b/main/channel.c @@ -27,14 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include -#include #include #include "asterisk/zapata.h" diff --git a/main/chanvars.c b/main/chanvars.c index 858933c92..ad92072f0 100644 --- a/main/chanvars.c +++ b/main/chanvars.c @@ -27,10 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #include "asterisk/chanvars.h" #include "asterisk/logger.h" #include "asterisk/strings.h" diff --git a/main/cli.c b/main/cli.c index 2cb85e474..a9f9fc37c 100644 --- a/main/cli.c +++ b/main/cli.c @@ -27,12 +27,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include #include -#include #include #include diff --git a/main/config.c b/main/config.c index 27c34ec15..da499acdd 100644 --- a/main/config.c +++ b/main/config.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/main/cryptostub.c b/main/cryptostub.c index fde6bfead..05fb39d29 100644 --- a/main/cryptostub.c +++ b/main/cryptostub.c @@ -27,9 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #include "asterisk/crypto.h" #include "asterisk/logger.h" diff --git a/main/db.c b/main/db.c index 50cba13d4..ab9821d46 100644 --- a/main/db.c +++ b/main/db.c @@ -31,13 +31,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include "asterisk/channel.h" diff --git a/main/devicestate.c b/main/devicestate.c index c36fa694c..c1ea18c5a 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -112,12 +112,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include - #include "asterisk/channel.h" #include "asterisk/utils.h" #include "asterisk/lock.h" diff --git a/main/dial.c b/main/dial.c index 3d4d3d739..252aa3c03 100644 --- a/main/dial.c +++ b/main/dial.c @@ -27,13 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/main/dlfcn.c b/main/dlfcn.c index 9a68b5c19..802e7942f 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 -#include -#include -#include -#include #include -#include #include #include #include diff --git a/main/dns.c b/main/dns.c index 05a64c469..a325796c0 100644 --- a/main/dns.c +++ b/main/dns.c @@ -33,12 +33,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include -#include #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/main/dnsmgr.c b/main/dnsmgr.c index b4c8e6307..34dc2ebc6 100644 --- a/main/dnsmgr.c +++ b/main/dnsmgr.c @@ -27,15 +27,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include -#include -#include -#include -#include #include #include diff --git a/main/dsp.c b/main/dsp.c index 4235affa8..8f806a428 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -44,13 +44,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include -#include #include "asterisk/frame.h" #include "asterisk/channel.h" diff --git a/main/enum.c b/main/enum.c index 9397f0f78..29a32126c 100644 --- a/main/enum.c +++ b/main/enum.c @@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -54,11 +53,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #endif #include -#include -#include #include #include -#include #include #include "asterisk/logger.h" diff --git a/main/event.c b/main/event.c index 23b16e52c..f9d9b657c 100644 --- a/main/event.c +++ b/main/event.c @@ -27,9 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #include "asterisk/event.h" #include "asterisk/linkedlists.h" #include "asterisk/lock.h" diff --git a/main/file.c b/main/file.c index de69ab087..a01fc5829 100644 --- a/main/file.c +++ b/main/file.c @@ -27,15 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include -#include -#include -#include #include #include -#include #include #include "asterisk/frame.h" diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c index a9d0f8707..8a885b8e6 100644 --- a/main/fixedjitterbuf.c +++ b/main/fixedjitterbuf.c @@ -29,11 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include -#include #include "asterisk/utils.h" #include "fixedjitterbuf.h" diff --git a/main/frame.c b/main/frame.c index 50e9dabbc..f756ee23c 100644 --- a/main/frame.c +++ b/main/frame.c @@ -27,11 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include -#include #include "asterisk/lock.h" #include "asterisk/frame.h" diff --git a/main/fskmodem.c b/main/fskmodem.c index 00ae1c80f..e59024834 100644 --- a/main/fskmodem.c +++ b/main/fskmodem.c @@ -32,8 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/fskmodem.h" #define NBW 2 diff --git a/main/hashtab.c b/main/hashtab.c index 19d642ebe..789438d20 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -26,13 +26,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision") -#include -#include -#include -#include #include #include -#include #include "asterisk/lock.h" #include "asterisk/frame.h" diff --git a/main/http.c b/main/http.c index d4e692ea6..7271e8523 100644 --- a/main/http.c +++ b/main/http.c @@ -32,12 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include -#include #include #include #include diff --git a/main/image.c b/main/image.c index f160cebff..f677aadfa 100644 --- a/main/image.c +++ b/main/image.c @@ -27,14 +27,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include #include -#include #include "asterisk/sched.h" #include "asterisk/options.h" diff --git a/main/indications.c b/main/indications.c index ebebc682b..0733a7d6c 100644 --- a/main/indications.c +++ b/main/indications.c @@ -32,9 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/lock.h" diff --git a/main/io.c b/main/io.c index c4ba3cffb..df06502f8 100644 --- a/main/io.c +++ b/main/io.c @@ -27,11 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include -#include #include #include "asterisk/io.h" diff --git a/main/jitterbuf.c b/main/jitterbuf.c index 127488696..81e60cc8a 100644 --- a/main/jitterbuf.c +++ b/main/jitterbuf.c @@ -31,11 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "jitterbuf.h" #include "asterisk/utils.h" #include "asterisk/options.h" diff --git a/main/loader.c b/main/loader.c index b51888dbe..1ac5f9c56 100644 --- a/main/loader.c +++ b/main/loader.c @@ -31,12 +31,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include -#include #include -#include #include "asterisk/linkedlists.h" #include "asterisk/module.h" diff --git a/main/logger.c b/main/logger.c index a5c7dd93a..83cdef36a 100644 --- a/main/logger.c +++ b/main/logger.c @@ -30,14 +30,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include #include -#include -#include #include -#include #include #include #if ((defined(AST_DEVMODE)) && (defined(linux))) diff --git a/main/manager.c b/main/manager.c index 37885d48d..7708d324f 100644 --- a/main/manager.c +++ b/main/manager.c @@ -45,12 +45,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include -#include #include #include #include @@ -58,7 +54,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include "asterisk/channel.h" diff --git a/main/md5.c b/main/md5.c index 949c408e2..594c5eff5 100644 --- a/main/md5.c +++ b/main/md5.c @@ -24,8 +24,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include /* for memcpy() */ - #include "asterisk/endian.h" #include "asterisk/md5.h" diff --git a/main/netsock.c b/main/netsock.c index e57c376ee..b391fc4ee 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -29,13 +29,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include #include diff --git a/main/pbx.c b/main/pbx.c index 6f6ef0de3..5c6bb394c 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -27,11 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include #include diff --git a/main/plc.c b/main/plc.c index 336a99030..ef549ca2c 100644 --- a/main/plc.c +++ b/main/plc.c @@ -34,9 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/plc.h" diff --git a/main/privacy.c b/main/privacy.c index b27bb5046..e52327fc3 100644 --- a/main/privacy.c +++ b/main/privacy.c @@ -27,13 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include "asterisk/channel.h" diff --git a/main/rtp.c b/main/rtp.c index 5ab4eb658..a6d9c7362 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -30,13 +30,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include #include diff --git a/main/say.c b/main/say.c index 6daabdcf3..70537c3c2 100644 --- a/main/say.c +++ b/main/say.c @@ -35,14 +35,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include #include -#include #ifdef SOLARIS #include diff --git a/main/sched.c b/main/sched.c index 986badd16..4e7e55423 100644 --- a/main/sched.c +++ b/main/sched.c @@ -36,11 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define DEBUG(a) #endif -#include -#include #include -#include -#include #include "asterisk/sched.h" #include "asterisk/logger.h" diff --git a/main/sha1.c b/main/sha1.c index a58a71385..3a6f7cc6b 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 038fa0d7b..73ef6280e 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -28,8 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/frame.h" #include "asterisk/slinfactory.h" #include "asterisk/logger.h" diff --git a/main/srv.c b/main/srv.c index 55a13e852..262be8079 100644 --- a/main/srv.c +++ b/main/srv.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #ifdef __APPLE__ @@ -42,9 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #endif #include -#include -#include -#include #include "asterisk/channel.h" #include "asterisk/logger.h" diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 44607c921..c132e901c 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -44,20 +44,17 @@ /*LINTLIBRARY*/ -#include + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include -#ifdef DEBUG -#include -#endif #include - #include "private.h" #include "tzfile.h" -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/localtime.h" diff --git a/main/strcompat.c b/main/strcompat.c index 243ef76cb..37ee407cd 100644 --- a/main/strcompat.c +++ b/main/strcompat.c @@ -21,16 +21,7 @@ #include "asterisk.h" -#include #include -#include -#include -#include -#include - -#ifdef HAVE_ALLOCA_H -#include -#endif #ifndef HAVE_STRSEP char *strsep(char **str, const char *delims) diff --git a/main/tdd.c b/main/tdd.c index 0d1f7fdce..cb3e2f1d7 100644 --- a/main/tdd.c +++ b/main/tdd.c @@ -32,10 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include -#include #include #include diff --git a/main/term.c b/main/term.c index d051338d8..2f679d898 100644 --- a/main/term.c +++ b/main/term.c @@ -27,16 +27,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include -#include #include "asterisk/term.h" #include "asterisk/options.h" diff --git a/main/threadstorage.c b/main/threadstorage.c index a03f3c98b..541671496 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #include "asterisk/logger.h" #include "asterisk/strings.h" #include "asterisk/utils.h" diff --git a/main/translate.c b/main/translate.c index aa096436d..734f369d4 100644 --- a/main/translate.c +++ b/main/translate.c @@ -27,14 +27,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/main/udptl.c b/main/udptl.c index beb76a988..4b67dc221 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -50,13 +50,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #include #include diff --git a/main/utils.c b/main/utils.c index d94889188..d7a04e9b2 100644 --- a/main/utils.c +++ b/main/utils.c @@ -28,14 +28,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include #include -#include -#include #include -#include #include #include #include diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index e618264a0..0d57cf7db 100644 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -26,15 +26,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include -#include #include #include -#include -#include -#include -#include #include "asterisk/frame.h" #include "asterisk/utils.h" diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index e6d1fdc87..95e6a1693 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -30,11 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include #include diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 0a62da744..24fa13ee4 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -27,10 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 611483a37..6f469214d 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -30,13 +30,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include #include -#include #include #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) #include diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index e1cb6dc5a..45a951d85 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -31,13 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include -#include -#include -#include #include #include diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 3221fb65d..47ac2f856 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -26,10 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/file.h" diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index c4701b3d0..d6f24514c 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -32,9 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/logger.h" diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 0d92fa720..4ef9ea225 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -27,10 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/file.h" diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index cac64737a..46cc44c9b 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -30,13 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include -#include #include -#include -#include -#include -#include #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/res/res_adsi.c b/res/res_adsi.c index ae166fe12..6a1cc6066 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -35,10 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include -#include -#include -#include #include #include diff --git a/res/res_ael_share.c b/res/res_ael_share.c index daa6a2360..e1fd46718 100644 --- a/res/res_ael_share.c +++ b/res/res_ael_share.c @@ -29,11 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 bb591c169..de84cbee7 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -27,20 +27,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include -#include #include #include #include diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 5f2b6ab03..5ecf0f782 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -28,10 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); -#include -#include -#include - #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 344633cf2..86c071cdc 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -38,11 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 6dbeae146..233fc6a69 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -30,9 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include /* PostgreSQL */ #include "asterisk/file.h" diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index 53987cc9a..ed0172631 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 -#include -#include -#include #include #include "asterisk/pbx.h" diff --git a/res/res_convert.c b/res/res_convert.c index c91c5e7ee..c4fc4a630 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #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 e76cab2e8..0b3b16ed2 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -34,14 +34,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include #include -#include #include -#include #include #include "asterisk/file.h" diff --git a/res/res_features.c b/res/res_features.c index 34c5661c0..b0bea0b54 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -28,12 +28,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include -#include -#include -#include -#include #include #include #include diff --git a/res/res_indications.c b/res/res_indications.c index ce6227dfc..49121084b 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -28,13 +28,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include -#include #include -#include #include #include "asterisk/lock.h" diff --git a/res/res_jabber.c b/res/res_jabber.c index 6dfcb9a25..b9bfa6c47 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -35,8 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include #include "asterisk/channel.h" diff --git a/res/res_limit.c b/res/res_limit.c index de2c7da9a..b8cc175d0 100644 --- a/res/res_limit.c +++ b/res/res_limit.c @@ -23,11 +23,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #define _XOPEN_SOURCE 600 -#include + #include #include #include diff --git a/res/res_monitor.c b/res/res_monitor.c index 3a5aa5914..e3698167e 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -27,11 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include -#include -#include #include #include diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index a1de8ba6b..dc42b6790 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -34,20 +34,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include -#include -#include #include -#include -#include #include #include #include #include #include -#include #include #ifdef SOLARIS #include diff --git a/res/res_odbc.c b/res/res_odbc.c index 8d3a4da0b..b458d602d 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -38,11 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 49f49c5eb..057657999 100644 --- a/res/res_realtime.c +++ b/res/res_realtime.c @@ -31,11 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 140241635..c785f2339 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -26,8 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include #include #include #include diff --git a/res/res_speech.c b/res/res_speech.c index 27b1d3235..958bd8171 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -27,11 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); -#include -#include -#include -#include - #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 8955aa045..0e82e2b01 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -1,8 +1,3 @@ -#include -#include -#include -#include -#include #include #include #include diff --git a/utils/hashtest.c b/utils/hashtest.c index 18dc713f4..dec2e7cd5 100644 --- a/utils/hashtest.c +++ b/utils/hashtest.c @@ -31,19 +31,10 @@ #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#ifdef HAVE_ALLOCA_H -#include -#endif -#include #include #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/hashtab.h" #include "asterisk/channel.h" diff --git a/utils/hashtest2.c b/utils/hashtest2.c index aaaeb06a3..956453c07 100644 --- a/utils/hashtest2.c +++ b/utils/hashtest2.c @@ -32,19 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#ifdef HAVE_ALLOCA_H -#include -#endif -#include #include #include #include #include -#include #include "asterisk/compat.h" #include "asterisk/lock.h" -- cgit v1.2.3