? include/astconf.h ? include/asterisk.h Index: acl.c =================================================================== RCS file: /usr/cvsroot/asterisk/acl.c,v retrieving revision 1.39 diff -u -r1.39 acl.c --- acl.c 9 Mar 2005 05:48:11 -0000 1.39 +++ acl.c 21 Apr 2005 05:23:37 -0000 @@ -18,13 +18,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/acl.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/srv.h" #include #include #include Index: aesopt.h =================================================================== RCS file: /usr/cvsroot/asterisk/aesopt.h,v retrieving revision 1.9 diff -u -r1.9 aesopt.h --- aesopt.h 29 Mar 2005 04:49:24 -0000 1.9 +++ aesopt.h 21 Apr 2005 05:23:37 -0000 @@ -135,8 +135,8 @@ #ifndef _AESOPT_H #define _AESOPT_H -#include -#include +#include "asterisk/aes.h" +#include "asterisk/endian.h" /* CONFIGURATION - USE OF DEFINES Index: alaw.c =================================================================== RCS file: /usr/cvsroot/asterisk/alaw.c,v retrieving revision 1.1 diff -u -r1.1 alaw.c --- alaw.c 9 Dec 2001 00:41:43 -0000 1.1 +++ alaw.c 21 Apr 2005 05:23:37 -0000 @@ -11,7 +11,7 @@ * the GNU General Public License */ -#include +#include "asterisk/alaw.h" #define AMI_MASK 0x55 Index: app.c =================================================================== RCS file: /usr/cvsroot/asterisk/app.c,v retrieving revision 1.55 diff -u -r1.55 app.c --- app.c 13 Apr 2005 23:33:47 -0000 1.55 +++ app.c 21 Apr 2005 05:23:38 -0000 @@ -22,16 +22,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/indications.h" #include "asterisk.h" #include "astconf.h" Index: ast_expr.y =================================================================== RCS file: /usr/cvsroot/asterisk/ast_expr.y,v retrieving revision 1.14 diff -u -r1.14 ast_expr.y --- ast_expr.y 3 Apr 2005 21:16:00 -0000 1.14 +++ ast_expr.y 21 Apr 2005 05:23:38 -0000 @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "asterisk/ast_expr.h" +#include "asterisk/logger.h" #ifndef QUAD_MIN #ifdef LONG_LONG_MIN Index: asterisk.c =================================================================== RCS file: /usr/cvsroot/asterisk/asterisk.c,v retrieving revision 1.148 diff -u -r1.148 asterisk.c --- asterisk.c 13 Apr 2005 04:47:38 -0000 1.148 +++ asterisk.c 21 Apr 2005 05:23:39 -0000 @@ -13,32 +13,32 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/channel.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/module.h" +#include "asterisk/image.h" +#include "asterisk/tdd.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/pbx.h" +#include "asterisk/enum.h" +#include "asterisk/rtp.h" +#include "asterisk/app.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/file.h" #include #include #include #include #include -#include -#include +#include "asterisk/io.h" +#include "asterisk/lock.h" #include #include #include @@ -47,7 +47,7 @@ #include #include "editline/histedit.h" #include "asterisk.h" -#include +#include "asterisk/config.h" #include #include #include Index: astmm.c =================================================================== RCS file: /usr/cvsroot/asterisk/astmm.c,v retrieving revision 1.12 diff -u -r1.12 astmm.c --- astmm.c 23 Mar 2005 05:56:31 -0000 1.12 +++ astmm.c 21 Apr 2005 05:23:39 -0000 @@ -19,10 +19,10 @@ #include #include #include -#include -#include -#include -#include +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" #define SOME_PRIME 563 Index: autoservice.c =================================================================== RCS file: /usr/cvsroot/asterisk/autoservice.c,v retrieving revision 1.9 diff -u -r1.9 autoservice.c --- autoservice.c 4 Mar 2005 06:47:23 -0000 1.9 +++ autoservice.c 21 Apr 2005 05:23:39 -0000 @@ -19,20 +19,20 @@ #include #include #include /* For PI */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/pbx.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/translate.h" +#include "asterisk/manager.h" +#include "asterisk/chanvars.h" +#include "asterisk/linkedlists.h" +#include "asterisk/indications.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #define MAX_AUTOMONS 256 Index: callerid.c =================================================================== RCS file: /usr/cvsroot/asterisk/callerid.c,v retrieving revision 1.29 diff -u -r1.29 callerid.c --- callerid.c 26 Feb 2005 07:34:09 -0000 1.29 +++ callerid.c 21 Apr 2005 05:23:39 -0000 @@ -21,14 +21,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/callerid.h" +#include "asterisk/logger.h" +#include "asterisk/fskmodem.h" +#include "asterisk/utils.h" struct callerid_state { fsk_data fskd; Index: cdr.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr.c,v retrieving revision 1.33 diff -u -r1.33 cdr.c --- cdr.c 13 Apr 2005 23:33:47 -0000 1.33 +++ cdr.c 21 Apr 2005 05:23:39 -0000 @@ -14,14 +14,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/logger.h" +#include "asterisk/callerid.h" +#include "asterisk/causes.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include #include #include Index: channel.c =================================================================== RCS file: /usr/cvsroot/asterisk/channel.c,v retrieving revision 1.188 diff -u -r1.188 channel.c --- channel.c 18 Apr 2005 16:26:41 -0000 1.188 +++ channel.c 21 Apr 2005 05:23:40 -0000 @@ -19,27 +19,27 @@ #include #include #include /* For PI */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/pbx.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/musiconhold.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/translate.h" +#include "asterisk/manager.h" +#include "asterisk/chanvars.h" +#include "asterisk/linkedlists.h" +#include "asterisk/indications.h" +#include "asterisk/monitor.h" +#include "asterisk/causes.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" +#include "asterisk/transcap.h" #ifdef ZAPTEL_OPTIMIZATIONS #include #ifdef __linux__ Index: chanvars.c =================================================================== RCS file: /usr/cvsroot/asterisk/chanvars.c,v retrieving revision 1.6 diff -u -r1.6 chanvars.c --- chanvars.c 1 Nov 2004 15:48:42 -0000 1.6 +++ chanvars.c 21 Apr 2005 05:23:40 -0000 @@ -14,8 +14,8 @@ #include #include -#include -#include +#include "asterisk/chanvars.h" +#include "asterisk/logger.h" struct ast_var_t *ast_var_assign(const char *name, const char *value) { Index: cli.c =================================================================== RCS file: /usr/cvsroot/asterisk/cli.c,v retrieving revision 1.76 diff -u -r1.76 cli.c --- cli.c 23 Mar 2005 05:56:31 -0000 1.76 +++ cli.c 21 Apr 2005 05:23:41 -0000 @@ -13,15 +13,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/channel.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include #include #include Index: config.c =================================================================== RCS file: /usr/cvsroot/asterisk/config.c,v retrieving revision 1.59 diff -u -r1.59 config.c --- config.c 17 Mar 2005 00:35:06 -0000 1.59 +++ config.c 21 Apr 2005 05:23:41 -0000 @@ -24,14 +24,14 @@ #endif # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/channel.h" +#include "asterisk/app.h" #include "asterisk.h" #include "astconf.h" Index: config_old.c =================================================================== RCS file: /usr/cvsroot/asterisk/config_old.c,v retrieving revision 1.1 diff -u -r1.1 config_old.c --- config_old.c 25 Jan 2005 06:11:11 -0000 1.1 +++ config_old.c 21 Apr 2005 05:23:41 -0000 @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include "asterisk/config.h" +#include "asterisk/logger.h" struct ast_config *ast_load(char *configfile) { Index: db.c =================================================================== RCS file: /usr/cvsroot/asterisk/db.c,v retrieving revision 1.14 diff -u -r1.14 db.c --- db.c 23 Feb 2005 22:58:11 -0000 1.14 +++ db.c 21 Apr 2005 05:23:41 -0000 @@ -23,17 +23,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/astdb.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/manager.h" #include "db1-ast/include/db.h" #include "asterisk.h" #include "astconf.h" Index: dlfcn.c =================================================================== RCS file: /usr/cvsroot/asterisk/dlfcn.c,v retrieving revision 1.2 diff -u -r1.2 dlfcn.c --- dlfcn.c 16 Feb 2005 02:58:17 -0000 1.2 +++ dlfcn.c 21 Apr 2005 05:23:42 -0000 @@ -47,7 +47,7 @@ #ifndef __BSD_VISIBLE #define __BSD_VISIBLE 1 #endif -#include +#include "asterisk/dlfcn-compat.h" #ifndef dl_restrict #define dl_restrict __restrict Index: dns.c =================================================================== RCS file: /usr/cvsroot/asterisk/dns.c,v retrieving revision 1.12 diff -u -r1.12 dns.c --- dns.c 29 Mar 2005 04:49:24 -0000 1.12 +++ dns.c 21 Apr 2005 05:23:42 -0000 @@ -16,10 +16,10 @@ #include #include -#include -#include -#include -#include +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/dns.h" +#include "asterisk/endian.h" #define MAX_SIZE 4096 Index: dnsmgr.c =================================================================== RCS file: /usr/cvsroot/asterisk/dnsmgr.c,v retrieving revision 1.3 diff -u -r1.3 dnsmgr.c --- dnsmgr.c 12 Apr 2005 14:11:59 -0000 1.3 +++ dnsmgr.c 21 Apr 2005 05:23:42 -0000 @@ -23,14 +23,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/dnsmgr.h" +#include "asterisk/linkedlists.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" #include "asterisk.h" static struct sched_context *sched; Index: dsp.c =================================================================== RCS file: /usr/cvsroot/asterisk/dsp.c,v retrieving revision 1.38 diff -u -r1.38 dsp.c --- dsp.c 4 Mar 2005 06:47:23 -0000 1.38 +++ dsp.c 21 Apr 2005 05:23:43 -0000 @@ -29,12 +29,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/dsp.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" #include #include #include Index: enum.c =================================================================== RCS file: /usr/cvsroot/asterisk/enum.c,v retrieving revision 1.24 diff -u -r1.24 enum.c --- enum.c 12 Mar 2005 16:58:04 -0000 1.24 +++ enum.c 21 Apr 2005 05:23:43 -0000 @@ -26,13 +26,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/enum.h" +#include "asterisk/dns.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" #ifdef __APPLE__ #undef T_NAPTR Index: file.c =================================================================== RCS file: /usr/cvsroot/asterisk/file.c,v retrieving revision 1.60 diff -u -r1.60 file.c --- file.c 7 Apr 2005 19:25:52 -0000 1.60 +++ file.c 21 Apr 2005 05:23:43 -0000 @@ -12,17 +12,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include #include #include Index: frame.c =================================================================== RCS file: /usr/cvsroot/asterisk/frame.c,v retrieving revision 1.50 diff -u -r1.50 frame.c --- frame.c 4 Apr 2005 02:13:40 -0000 1.50 +++ frame.c 21 Apr 2005 05:23:43 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cli.h" +#include "asterisk/term.h" +#include "asterisk/utils.h" #include #include #include Index: fskmodem.c =================================================================== RCS file: /usr/cvsroot/asterisk/fskmodem.c,v retrieving revision 1.3 diff -u -r1.3 fskmodem.c --- fskmodem.c 19 Sep 2004 16:17:17 -0000 1.3 +++ fskmodem.c 21 Apr 2005 05:23:43 -0000 @@ -14,7 +14,7 @@ * */ -#include +#include "asterisk/fskmodem.h" #include Index: image.c =================================================================== RCS file: /usr/cvsroot/asterisk/image.c,v retrieving revision 1.11 diff -u -r1.11 image.c --- image.c 4 Mar 2005 06:47:23 -0000 1.11 +++ image.c 21 Apr 2005 05:23:43 -0000 @@ -19,15 +19,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/image.h" +#include "asterisk/translate.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" #include "asterisk.h" #include "astconf.h" Index: indications.c =================================================================== RCS file: /usr/cvsroot/asterisk/indications.c,v retrieving revision 1.22 diff -u -r1.22 indications.c --- indications.c 16 Feb 2005 02:58:17 -0000 1.22 +++ indications.c 21 Apr 2005 05:23:43 -0000 @@ -20,13 +20,13 @@ #include #include #include /* For PI */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/indications.h" +#include "asterisk/frame.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" struct playtones_item { int freq1; Index: io.c =================================================================== RCS file: /usr/cvsroot/asterisk/io.c,v retrieving revision 1.7 diff -u -r1.7 io.c --- io.c 26 Oct 2003 18:50:49 -0000 1.7 +++ io.c 21 Apr 2005 05:23:43 -0000 @@ -17,8 +17,8 @@ #include #include /* for memset */ #include -#include -#include +#include "asterisk/io.h" +#include "asterisk/logger.h" #ifdef DEBUG_IO #define DEBUG DEBUG_M Index: loader.c =================================================================== RCS file: /usr/cvsroot/asterisk/loader.c,v retrieving revision 1.38 diff -u -r1.38 loader.c --- loader.c 6 Apr 2005 21:12:32 -0000 1.38 +++ loader.c 21 Apr 2005 05:23:44 -0000 @@ -16,22 +16,22 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/enum.h" +#include "asterisk/rtp.h" +#include "asterisk/lock.h" #ifdef __APPLE__ -#include +#include "asterisk/dlfcn-compat.h" #else #include #endif -#include +#include "asterisk/md5.h" #include "asterisk.h" #include "astconf.h" Index: logger.c =================================================================== RCS file: /usr/cvsroot/asterisk/logger.c,v retrieving revision 1.64 diff -u -r1.64 logger.c --- logger.c 3 Apr 2005 21:25:45 -0000 1.64 +++ logger.c 21 Apr 2005 05:23:44 -0000 @@ -16,14 +16,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/term.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/manager.h" #include #include #include @@ -45,7 +45,7 @@ #define SYSLOG_NLEVELS 6 -#include +#include "asterisk/logger.h" #define MAX_MSG_QUEUE 200 Index: manager.c =================================================================== RCS file: /usr/cvsroot/asterisk/manager.c,v retrieving revision 1.92 diff -u -r1.92 manager.c --- manager.c 13 Apr 2005 23:33:47 -0000 1.92 +++ manager.c 21 Apr 2005 05:23:44 -0000 @@ -26,20 +26,21 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/manager.h" +#include "asterisk/config.h" +#include "asterisk/callerid.h" +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/pbx.h" +#include "asterisk/md5.h" +#include "asterisk/acl.h" +#include "asterisk/utils.h" struct fast_originate_helper { Index: md5.c =================================================================== RCS file: /usr/cvsroot/asterisk/md5.c,v retrieving revision 1.11 diff -u -r1.11 md5.c --- md5.c 10 Apr 2005 21:43:03 -0000 1.11 +++ md5.c 21 Apr 2005 05:23:44 -0000 @@ -18,8 +18,8 @@ * will fill a supplied 16-byte array with the digest. */ #include /* for memcpy() */ -#include -#include +#include "asterisk/endian.h" +#include "asterisk/md5.h" # if __BYTE_ORDER == __BIG_ENDIAN # define HIGHFIRST 1 Index: pbx.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx.c,v retrieving revision 1.227 diff -u -r1.227 pbx.c --- pbx.c 20 Apr 2005 16:11:16 -0000 1.227 +++ pbx.c 21 Apr 2005 05:23:46 -0000 @@ -13,25 +13,25 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/cli.h" +#include "asterisk/pbx.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/callerid.h" +#include "asterisk/cdr.h" +#include "asterisk/config.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/ast_expr.h" +#include "asterisk/linkedlists.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/musiconhold.h" +#include "asterisk/app.h" #include #include #include Index: plc.c =================================================================== RCS file: /usr/cvsroot/asterisk/plc.c,v retrieving revision 1.3 diff -u -r1.3 plc.c --- plc.c 20 Mar 2005 02:53:48 -0000 1.3 +++ plc.c 21 Apr 2005 05:23:46 -0000 @@ -35,7 +35,7 @@ #include #include -#include +#include "asterisk/plc.h" #if !defined(FALSE) #define FALSE 0 Index: poll.c =================================================================== RCS file: /usr/cvsroot/asterisk/poll.c,v retrieving revision 1.1 diff -u -r1.1 poll.c --- poll.c 26 Oct 2003 19:17:28 -0000 1.1 +++ poll.c 21 Apr 2005 05:23:46 -0000 @@ -77,7 +77,7 @@ #include /* assertion macros */ #include /* string functions */ -#include /* this package */ +#include "asterisk/poll-compat.h" /* this package */ /*---------------------------------------------------------------------------*\ Macros Index: privacy.c =================================================================== RCS file: /usr/cvsroot/asterisk/privacy.c,v retrieving revision 1.3 diff -u -r1.3 privacy.c --- privacy.c 22 Jun 2004 18:48:59 -0000 1.3 +++ privacy.c 21 Apr 2005 05:23:46 -0000 @@ -19,17 +19,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/astdb.h" +#include "asterisk/callerid.h" +#include "asterisk/privacy.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include "asterisk.h" int ast_privacy_check(char *dest, char *cid) Index: rtp.c =================================================================== RCS file: /usr/cvsroot/asterisk/rtp.c,v retrieving revision 1.123 diff -u -r1.123 rtp.c --- rtp.c 20 Apr 2005 16:46:25 -0000 1.123 +++ rtp.c 21 Apr 2005 05:23:47 -0000 @@ -26,18 +26,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/rtp.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/acl.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" +#include "asterisk/unaligned.h" #define MAX_TIMESTAMP_SKEW 640 Index: say.c =================================================================== RCS file: /usr/cvsroot/asterisk/say.c,v retrieving revision 1.55 diff -u -r1.55 say.c --- say.c 13 Apr 2005 05:07:47 -0000 1.55 +++ say.c 21 Apr 2005 05:23:49 -0000 @@ -21,13 +21,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/lock.h" +#include "asterisk/localtime.h" +#include "asterisk/utils.h" #include "asterisk.h" #include Index: sched.c =================================================================== RCS file: /usr/cvsroot/asterisk/sched.c,v retrieving revision 1.17 diff -u -r1.17 sched.c --- sched.c 15 Apr 2005 17:34:14 -0000 1.17 +++ sched.c 21 Apr 2005 05:23:49 -0000 @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include "asterisk/sched.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/lock.h" /* Determine if a is sooner than b */ #define SOONER(a,b) (((b).tv_sec > (a).tv_sec) || \ Index: srv.c =================================================================== RCS file: /usr/cvsroot/asterisk/srv.c,v retrieving revision 1.11 diff -u -r1.11 srv.c --- srv.c 17 Jul 2004 22:06:26 -0000 1.11 +++ srv.c 21 Apr 2005 05:23:49 -0000 @@ -22,12 +22,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/srv.h" +#include "asterisk/dns.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #ifdef __APPLE__ #undef T_SRV Index: tdd.c =================================================================== RCS file: /usr/cvsroot/asterisk/tdd.c,v retrieving revision 1.3 diff -u -r1.3 tdd.c --- tdd.c 28 Mar 2005 20:48:24 -0000 1.3 +++ tdd.c 21 Apr 2005 05:23:49 -0000 @@ -21,10 +21,10 @@ #include #include #include -#include -#include -#include -#include +#include "asterisk/ulaw.h" +#include "asterisk/tdd.h" +#include "asterisk/logger.h" +#include "asterisk/fskmodem.h" #include "ecdisa.h" Index: term.c =================================================================== RCS file: /usr/cvsroot/asterisk/term.c,v retrieving revision 1.7 diff -u -r1.7 term.c --- term.c 1 Oct 2004 03:11:52 -0000 1.7 +++ term.c 21 Apr 2005 05:23:49 -0000 @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include "asterisk/term.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" #include "asterisk.h" static int vt100compat = 0; Index: translate.c =================================================================== RCS file: /usr/cvsroot/asterisk/translate.c,v retrieving revision 1.33 diff -u -r1.33 translate.c --- translate.c 4 Apr 2005 03:28:38 -0000 1.33 +++ translate.c 21 Apr 2005 05:23:49 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/cli.h" +#include "asterisk/term.h" #include #include #include Index: ulaw.c =================================================================== RCS file: /usr/cvsroot/asterisk/ulaw.c,v retrieving revision 1.2 diff -u -r1.2 ulaw.c --- ulaw.c 7 Dec 2001 22:57:34 -0000 1.2 +++ ulaw.c 21 Apr 2005 05:23:49 -0000 @@ -11,7 +11,7 @@ * the GNU General Public License */ -#include +#include "asterisk/ulaw.h" #define ZEROTRAP /* turn on the trap as per the MIL-STD */ #define BIAS 0x84 /* define the add-in bias for 16 bit samples */ Index: utils.c =================================================================== RCS file: /usr/cvsroot/asterisk/utils.c,v retrieving revision 1.37 diff -u -r1.37 utils.c --- utils.c 6 Apr 2005 21:12:32 -0000 1.37 +++ utils.c 21 Apr 2005 05:23:49 -0000 @@ -22,11 +22,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/io.h" +#include "asterisk/logger.h" +#include "asterisk/md5.h" static char base64[64]; static char b2a[256]; Index: apps/app_adsiprog.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_adsiprog.c,v retrieving revision 1.9 diff -u -r1.9 app_adsiprog.c --- apps/app_adsiprog.c 26 Jul 2004 03:23:38 -0000 1.9 +++ apps/app_adsiprog.c 21 Apr 2005 05:23:50 -0000 @@ -12,15 +12,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/adsi.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include #include #include @@ -30,8 +30,8 @@ #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" static char *tdesc = "Asterisk ADSI Programming Application"; Index: apps/app_alarmreceiver.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_alarmreceiver.c,v retrieving revision 1.8 diff -u -r1.8 app_alarmreceiver.c --- apps/app_alarmreceiver.c 25 Jan 2005 06:10:19 -0000 1.8 +++ apps/app_alarmreceiver.c 21 Apr 2005 05:23:50 -0000 @@ -18,21 +18,21 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/ulaw.h" +#include "asterisk/options.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/config.h" +#include "asterisk/localtime.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include #include #include Index: apps/app_authenticate.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_authenticate.c,v retrieving revision 1.7 diff -u -r1.7 app_authenticate.c --- apps/app_authenticate.c 11 Nov 2004 15:16:50 -0000 1.7 +++ apps/app_authenticate.c 21 Apr 2005 05:23:50 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/app.h" +#include "asterisk/astdb.h" +#include "asterisk/utils.h" #include #include #include Index: apps/app_cdr.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_cdr.c,v retrieving revision 1.4 diff -u -r1.4 app_cdr.c --- apps/app_cdr.c 22 Oct 2003 02:53:39 -0000 1.4 +++ apps/app_cdr.c 21 Apr 2005 05:23:50 -0000 @@ -12,9 +12,9 @@ */ #include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" #include Index: apps/app_chanisavail.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_chanisavail.c,v retrieving revision 1.14 diff -u -r1.14 app_chanisavail.c --- apps/app_chanisavail.c 27 Mar 2005 23:01:55 -0000 1.14 +++ apps/app_chanisavail.c 21 Apr 2005 05:23:50 -0000 @@ -13,13 +13,13 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/app.h" #include #include #include Index: apps/app_chanspy.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v retrieving revision 1.13 diff -u -r1.13 app_chanspy.c --- apps/app_chanspy.c 3 Apr 2005 15:46:22 -0000 1.13 +++ apps/app_chanspy.c 21 Apr 2005 05:23:50 -0000 @@ -11,25 +11,26 @@ * the GNU General Public License */ -#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" - -#include <../asterisk.h> -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include + +#include "asterisk.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/features.h" +#include "asterisk/options.h" +#include "asterisk/app.h" +#include "asterisk/utils.h" +#include "asterisk/say.h" +#include "asterisk/pbx.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" + +#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" AST_MUTEX_DEFINE_STATIC(modlock); Index: apps/app_controlplayback.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v retrieving revision 1.8 diff -u -r1.8 app_controlplayback.c --- apps/app_controlplayback.c 26 Oct 2004 02:25:50 -0000 1.8 +++ apps/app_controlplayback.c 21 Apr 2005 05:23:50 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" #include #include Index: apps/app_curl.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_curl.c,v retrieving revision 1.5 diff -u -r1.5 app_curl.c --- apps/app_curl.c 7 Apr 2005 22:20:07 -0000 1.5 +++ apps/app_curl.c 21 Apr 2005 05:23:50 -0000 @@ -12,14 +12,14 @@ * redistribution. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/cli.h" +#include "asterisk/options.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_cut.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_cut.c,v retrieving revision 1.7 diff -u -r1.7 app_cut.c --- apps/app_cut.c 1 Apr 2005 22:03:17 -0000 1.7 +++ apps/app_cut.c 21 Apr 2005 05:23:51 -0000 @@ -17,12 +17,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 Index: apps/app_datetime.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_datetime.c,v retrieving revision 1.2 diff -u -r1.2 app_datetime.c --- apps/app_datetime.c 22 Jun 2004 19:32:52 -0000 1.2 +++ apps/app_datetime.c 21 Apr 2005 05:23:51 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/say.h" #include #include #include Index: apps/app_db.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_db.c,v retrieving revision 1.8 diff -u -r1.8 app_db.c --- apps/app_db.c 21 Jan 2005 07:06:24 -0000 1.8 +++ apps/app_db.c 21 Apr 2005 05:23:51 -0000 @@ -14,14 +14,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/options.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/astdb.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_dial.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v retrieving revision 1.148 diff -u -r1.148 app_dial.c --- apps/app_dial.c 15 Apr 2005 05:30:27 -0000 1.148 +++ apps/app_dial.c 21 Apr 2005 05:23:51 -0000 @@ -11,23 +11,23 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/config.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" +#include "asterisk/app.h" +#include "asterisk/causes.h" +#include "asterisk/manager.h" #include #include #include Index: apps/app_directory.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v retrieving revision 1.34 diff -u -r1.34 app_directory.c --- apps/app_directory.c 6 Apr 2005 18:55:33 -0000 1.34 +++ apps/app_directory.c 21 Apr 2005 05:23:51 -0000 @@ -11,21 +11,21 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" #include #include #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" static char *tdesc = "Extension Directory"; static char *app = "Directory"; Index: apps/app_disa.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v retrieving revision 1.25 diff -u -r1.25 app_disa.c --- apps/app_disa.c 26 Mar 2005 07:08:47 -0000 1.25 +++ apps/app_disa.c 21 Apr 2005 05:23:51 -0000 @@ -13,17 +13,17 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/app.h" +#include "asterisk/indications.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/ulaw.h" +#include "asterisk/callerid.h" #include #include #include Index: apps/app_dumpchan.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_dumpchan.c,v retrieving revision 1.6 diff -u -r1.6 app_dumpchan.c --- apps/app_dumpchan.c 21 Jan 2005 07:06:24 -0000 1.6 +++ apps/app_dumpchan.c 21 Apr 2005 05:23:51 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License (and disclaimed to Digium) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include #include #include Index: apps/app_echo.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_echo.c,v retrieving revision 1.10 diff -u -r1.10 app_echo.c --- apps/app_echo.c 22 Jun 2004 19:32:52 -0000 1.10 +++ apps/app_echo.c 21 Apr 2005 05:23:51 -0000 @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_enumlookup.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_enumlookup.c,v retrieving revision 1.13 diff -u -r1.13 app_enumlookup.c --- apps/app_enumlookup.c 25 Jan 2005 06:10:19 -0000 1.13 +++ apps/app_enumlookup.c 21 Apr 2005 05:23:52 -0000 @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/enum.h" +#include "asterisk/utils.h" #include #include #include Index: apps/app_eval.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_eval.c,v retrieving revision 1.2 diff -u -r1.2 app_eval.c --- apps/app_eval.c 21 Jan 2005 07:06:24 -0000 1.2 +++ apps/app_eval.c 21 Apr 2005 05:23:52 -0000 @@ -17,12 +17,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 Index: apps/app_exec.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_exec.c,v retrieving revision 1.3 diff -u -r1.3 app_exec.c --- apps/app_exec.c 29 Mar 2005 06:18:58 -0000 1.3 +++ apps/app_exec.c 21 Apr 2005 05:23:52 -0000 @@ -17,12 +17,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 Index: apps/app_festival.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_festival.c,v retrieving revision 1.29 diff -u -r1.29 app_festival.c --- apps/app_festival.c 25 Jan 2005 06:10:19 -0000 1.29 +++ apps/app_festival.c 21 Apr 2005 05:23:52 -0000 @@ -12,15 +12,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/md5.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_flash.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_flash.c,v retrieving revision 1.3 diff -u -r1.3 app_flash.c --- apps/app_flash.c 22 Jun 2004 19:32:52 -0000 1.3 +++ apps/app_flash.c 21 Apr 2005 05:23:52 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/options.h" #include #ifdef __linux__ #include Index: apps/app_forkcdr.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_forkcdr.c,v retrieving revision 1.7 diff -u -r1.7 app_forkcdr.c --- apps/app_forkcdr.c 25 Mar 2005 16:24:12 -0000 1.7 +++ apps/app_forkcdr.c 21 Apr 2005 05:23:52 -0000 @@ -9,12 +9,12 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_getcpeid.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_getcpeid.c,v retrieving revision 1.4 diff -u -r1.4 app_getcpeid.c --- apps/app_getcpeid.c 8 Jan 2005 19:30:40 -0000 1.4 +++ apps/app_getcpeid.c 21 Apr 2005 05:23:52 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/adsi.h" +#include "asterisk/options.h" #include #include #include Index: apps/app_groupcount.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_groupcount.c,v retrieving revision 1.8 diff -u -r1.8 app_groupcount.c --- apps/app_groupcount.c 21 Jan 2005 07:06:24 -0000 1.8 +++ apps/app_groupcount.c 21 Apr 2005 05:23:52 -0000 @@ -17,15 +17,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" STANDARD_LOCAL_USER; Index: apps/app_hasnewvoicemail.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_hasnewvoicemail.c,v retrieving revision 1.11 diff -u -r1.11 app_hasnewvoicemail.c --- apps/app_hasnewvoicemail.c 21 Jan 2005 07:06:24 -0000 1.11 +++ apps/app_hasnewvoicemail.c 21 Apr 2005 05:23:52 -0000 @@ -32,20 +32,20 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include #include #include #include #include -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder."; static char *app_hasvoicemail = "HasVoicemail"; Index: apps/app_ices.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_ices.c,v retrieving revision 1.4 diff -u -r1.4 app_ices.c --- apps/app_ices.c 22 Jun 2004 19:32:52 -0000 1.4 +++ apps/app_ices.c 21 Apr 2005 05:23:52 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/frame.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include #include @@ -27,7 +27,7 @@ #include #include #include -#include "../astconf.h" +#include "astconf.h" #define ICES "/usr/bin/ices" #define LOCAL_ICES "/usr/local/bin/ices" Index: apps/app_image.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_image.c,v retrieving revision 1.5 diff -u -r1.5 app_image.c --- apps/app_image.c 21 Jan 2005 07:06:24 -0000 1.5 +++ apps/app_image.c 21 Apr 2005 05:23:52 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include #include Index: apps/app_intercom.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_intercom.c,v retrieving revision 1.20 diff -u -r1.20 app_intercom.c --- apps/app_intercom.c 22 Jun 2004 19:32:52 -0000 1.20 +++ apps/app_intercom.c 21 Apr 2005 05:23:52 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include #include Index: apps/app_ivrdemo.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_ivrdemo.c,v retrieving revision 1.5 diff -u -r1.5 app_ivrdemo.c --- apps/app_ivrdemo.c 12 Mar 2005 05:37:32 -0000 1.5 +++ apps/app_ivrdemo.c 21 Apr 2005 05:23:52 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include #include #include Index: apps/app_lookupblacklist.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_lookupblacklist.c,v retrieving revision 1.7 diff -u -r1.7 app_lookupblacklist.c --- apps/app_lookupblacklist.c 21 Jan 2005 07:06:24 -0000 1.7 +++ apps/app_lookupblacklist.c 21 Apr 2005 05:23:52 -0000 @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include #include Index: apps/app_lookupcidname.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_lookupcidname.c,v retrieving revision 1.6 diff -u -r1.6 app_lookupcidname.c --- apps/app_lookupcidname.c 21 Jan 2005 07:06:24 -0000 1.6 +++ apps/app_lookupcidname.c 21 Apr 2005 05:23:52 -0000 @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include #include Index: apps/app_macro.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_macro.c,v retrieving revision 1.21 diff -u -r1.21 app_macro.c --- apps/app_macro.c 21 Jan 2005 07:06:24 -0000 1.21 +++ apps/app_macro.c 21 Apr 2005 05:23:52 -0000 @@ -12,15 +12,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_math.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_math.c,v retrieving revision 1.6 diff -u -r1.6 app_math.c --- apps/app_math.c 4 Mar 2005 06:47:23 -0000 1.6 +++ apps/app_math.c 21 Apr 2005 05:23:52 -0000 @@ -9,20 +9,20 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/app.h" +#include "asterisk/manager.h" +#include "asterisk/localtime.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #include #include #include @@ -34,11 +34,11 @@ #include #include #include -#include -#include +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Basic Math Functions"; Index: apps/app_md5.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_md5.c,v retrieving revision 1.3 diff -u -r1.3 app_md5.c --- apps/app_md5.c 12 Mar 2005 05:37:32 -0000 1.3 +++ apps/app_md5.c 21 Apr 2005 05:23:52 -0000 @@ -9,14 +9,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_meetme.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v retrieving revision 1.94 diff -u -r1.94 app_meetme.c --- apps/app_meetme.c 13 Apr 2005 23:33:47 -0000 1.94 +++ apps/app_meetme.c 21 Apr 2005 05:23:53 -0000 @@ -11,29 +11,29 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" #include #include #include #include #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #ifdef __linux__ #include Index: apps/app_milliwatt.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_milliwatt.c,v retrieving revision 1.9 diff -u -r1.9 app_milliwatt.c --- apps/app_milliwatt.c 22 Jun 2004 19:32:52 -0000 1.9 +++ apps/app_milliwatt.c 21 Apr 2005 05:23:53 -0000 @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_mp3.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_mp3.c,v retrieving revision 1.23 diff -u -r1.23 app_mp3.c --- apps/app_mp3.c 21 Jan 2005 07:06:24 -0000 1.23 +++ apps/app_mp3.c 21 Apr 2005 05:23:53 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/frame.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include #include Index: apps/app_nbscat.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_nbscat.c,v retrieving revision 1.8 diff -u -r1.8 app_nbscat.c --- apps/app_nbscat.c 14 Dec 2004 23:36:29 -0000 1.8 +++ apps/app_nbscat.c 21 Apr 2005 05:23:53 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/frame.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include #include Index: apps/app_osplookup.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_osplookup.c,v retrieving revision 1.5 diff -u -r1.5 app_osplookup.c --- apps/app_osplookup.c 21 Jan 2005 07:06:24 -0000 1.5 +++ apps/app_osplookup.c 21 Apr 2005 05:23:53 -0000 @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astosp.h" #include #include #include Index: apps/app_parkandannounce.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_parkandannounce.c,v retrieving revision 1.13 diff -u -r1.13 app_parkandannounce.c --- apps/app_parkandannounce.c 4 Mar 2005 06:47:23 -0000 1.13 +++ apps/app_parkandannounce.c 21 Apr 2005 05:23:53 -0000 @@ -15,16 +15,16 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/features.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/lock.h" #include #include Index: apps/app_playback.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_playback.c,v retrieving revision 1.16 diff -u -r1.16 app_playback.c --- apps/app_playback.c 10 Mar 2005 07:47:02 -0000 1.16 +++ apps/app_playback.c 21 Apr 2005 05:23:53 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" #include #include Index: apps/app_privacy.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_privacy.c,v retrieving revision 1.13 diff -u -r1.13 app_privacy.c --- apps/app_privacy.c 25 Jan 2005 06:10:19 -0000 1.13 +++ apps/app_privacy.c 21 Apr 2005 05:23:53 -0000 @@ -11,19 +11,19 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/utils.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/app.h" +#include "asterisk/config.h" #include #include Index: apps/app_queue.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v retrieving revision 1.135 diff -u -r1.135 app_queue.c --- apps/app_queue.c 13 Apr 2005 23:33:47 -0000 1.135 +++ apps/app_queue.c 21 Apr 2005 05:23:54 -0000 @@ -39,24 +39,24 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/cli.h" +#include "asterisk/manager.h" +#include "asterisk/config.h" +#include "asterisk/monitor.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astdb.h" #include #include #include @@ -67,7 +67,7 @@ #include #include -#include "../astconf.h" +#include "astconf.h" #define QUEUE_STRATEGY_RINGALL 0 #define QUEUE_STRATEGY_ROUNDROBIN 1 Index: apps/app_random.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_random.c,v retrieving revision 1.4 diff -u -r1.4 app_random.c --- apps/app_random.c 13 Apr 2005 04:47:38 -0000 1.4 +++ apps/app_random.c 21 Apr 2005 05:23:54 -0000 @@ -11,12 +11,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_read.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_read.c,v retrieving revision 1.16 diff -u -r1.16 app_read.c --- apps/app_read.c 23 Mar 2005 05:56:31 -0000 1.16 +++ apps/app_read.c 21 Apr 2005 05:23:54 -0000 @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include #include Index: apps/app_readfile.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_readfile.c,v retrieving revision 1.1 diff -u -r1.1 app_readfile.c --- apps/app_readfile.c 27 Feb 2005 19:07:46 -0000 1.1 +++ apps/app_readfile.c 21 Apr 2005 05:23:55 -0000 @@ -16,13 +16,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" static char *tdesc = "Stores output of file into a variable"; Index: apps/app_realtime.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_realtime.c,v retrieving revision 1.6 diff -u -r1.6 app_realtime.c --- apps/app_realtime.c 25 Jan 2005 06:10:19 -0000 1.6 +++ apps/app_realtime.c 21 Apr 2005 05:23:55 -0000 @@ -12,15 +12,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/cli.h" #include #include #include Index: apps/app_record.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_record.c,v retrieving revision 1.29 diff -u -r1.29 app_record.c --- apps/app_record.c 5 Feb 2005 16:52:46 -0000 1.29 +++ apps/app_record.c 21 Apr 2005 05:23:55 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/dsp.h" +#include "asterisk/utils.h" #include #include Index: apps/app_rpt.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_rpt.c,v retrieving revision 1.29 diff -u -r1.29 app_rpt.c --- apps/app_rpt.c 29 Jan 2005 07:31:17 -0000 1.29 +++ apps/app_rpt.c 21 Apr 2005 05:23:56 -0000 @@ -120,19 +120,19 @@ enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM}; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/callerid.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/localtime.h" #include #include #include Index: apps/app_sayunixtime.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_sayunixtime.c,v retrieving revision 1.7 diff -u -r1.7 app_sayunixtime.c --- apps/app_sayunixtime.c 13 Nov 2004 16:13:07 -0000 1.7 +++ apps/app_sayunixtime.c 21 Apr 2005 05:23:56 -0000 @@ -15,13 +15,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/say.h" static char *tdesc = "Say time"; Index: apps/app_senddtmf.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_senddtmf.c,v retrieving revision 1.8 diff -u -r1.8 app_senddtmf.c --- apps/app_senddtmf.c 31 Dec 2004 00:29:29 -0000 1.8 +++ apps/app_senddtmf.c 21 Apr 2005 05:23:56 -0000 @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/app.h" #include #include Index: apps/app_sendtext.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_sendtext.c,v retrieving revision 1.5 diff -u -r1.5 app_sendtext.c --- apps/app_sendtext.c 4 Mar 2005 06:47:23 -0000 1.5 +++ apps/app_sendtext.c 21 Apr 2005 05:23:56 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include #include Index: apps/app_setcallerid.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_setcallerid.c,v retrieving revision 1.6 diff -u -r1.6 app_setcallerid.c --- apps/app_setcallerid.c 26 Feb 2005 07:34:09 -0000 1.6 +++ apps/app_setcallerid.c 21 Apr 2005 05:23:56 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" #include #include Index: apps/app_setcdruserfield.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_setcdruserfield.c,v retrieving revision 1.5 diff -u -r1.5 app_setcdruserfield.c --- apps/app_setcdruserfield.c 20 May 2004 16:30:10 -0000 1.5 +++ apps/app_setcdruserfield.c 21 Apr 2005 05:23:56 -0000 @@ -12,14 +12,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/logger.h" +#include "asterisk/config.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" #include #include Index: apps/app_setcidname.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_setcidname.c,v retrieving revision 1.5 diff -u -r1.5 app_setcidname.c --- apps/app_setcidname.c 2 Oct 2004 00:58:31 -0000 1.5 +++ apps/app_setcidname.c 21 Apr 2005 05:23:56 -0000 @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include #include Index: apps/app_setcidnum.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_setcidnum.c,v retrieving revision 1.6 diff -u -r1.6 app_setcidnum.c --- apps/app_setcidnum.c 21 Jan 2005 07:06:24 -0000 1.6 +++ apps/app_setcidnum.c 21 Apr 2005 05:23:56 -0000 @@ -12,16 +12,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include #include Index: apps/app_setrdnis.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_setrdnis.c,v retrieving revision 1.1 diff -u -r1.1 app_setrdnis.c --- apps/app_setrdnis.c 30 Jan 2005 06:09:28 -0000 1.1 +++ apps/app_setrdnis.c 21 Apr 2005 05:23:56 -0000 @@ -12,16 +12,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include #include Index: apps/app_settransfercapability.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_settransfercapability.c,v retrieving revision 1.2 diff -u -r1.2 app_settransfercapability.c --- apps/app_settransfercapability.c 1 Apr 2005 23:56:32 -0000 1.2 +++ apps/app_settransfercapability.c 21 Apr 2005 05:23:56 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/transcap.h" #include #include -#include +#include "asterisk/transcap.h" static char *app = "SetTransferCapability"; Index: apps/app_skel.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v retrieving revision 1.9 diff -u -r1.9 app_skel.c --- apps/app_skel.c 27 Mar 2005 22:29:57 -0000 1.9 +++ apps/app_skel.c 21 Apr 2005 05:23:56 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include #include #include Index: apps/app_sms.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_sms.c,v retrieving revision 1.18 diff -u -r1.18 app_sms.c --- apps/app_sms.c 3 Apr 2005 20:25:43 -0000 1.18 +++ apps/app_sms.c 21 Apr 2005 05:23:57 -0000 @@ -9,15 +9,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" #include #include #include @@ -27,7 +27,7 @@ #include #include #include -#include "../astconf.h" +#include "astconf.h" /* output using Alaw rather than linear */ /*#define OUTALAW */ Index: apps/app_softhangup.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_softhangup.c,v retrieving revision 1.5 diff -u -r1.5 app_softhangup.c --- apps/app_softhangup.c 12 Jan 2005 15:55:52 -0000 1.5 +++ apps/app_softhangup.c 21 Apr 2005 05:23:57 -0000 @@ -12,12 +12,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_sql_postgres.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_sql_postgres.c,v retrieving revision 1.10 diff -u -r1.10 app_sql_postgres.c --- apps/app_sql_postgres.c 16 Apr 2005 08:50:50 -0000 1.10 +++ apps/app_sql_postgres.c 21 Apr 2005 05:23:57 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_striplsd.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_striplsd.c,v retrieving revision 1.4 diff -u -r1.4 app_striplsd.c --- apps/app_striplsd.c 14 Jul 2004 07:34:34 -0000 1.4 +++ apps/app_striplsd.c 21 Apr 2005 05:23:57 -0000 @@ -12,12 +12,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_substring.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_substring.c,v retrieving revision 1.9 diff -u -r1.9 app_substring.c --- apps/app_substring.c 14 Jul 2004 07:34:34 -0000 1.9 +++ apps/app_substring.c 21 Apr 2005 05:23:57 -0000 @@ -12,13 +12,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_system.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_system.c,v retrieving revision 1.13 diff -u -r1.13 app_system.c --- apps/app_system.c 21 Jan 2005 07:06:24 -0000 1.13 +++ apps/app_system.c 21 Apr 2005 05:23:57 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/app.h" #include #include #include Index: apps/app_talkdetect.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_talkdetect.c,v retrieving revision 1.7 diff -u -r1.7 app_talkdetect.c --- apps/app_talkdetect.c 21 Jan 2005 07:06:24 -0000 1.7 +++ apps/app_talkdetect.c 21 Apr 2005 05:23:57 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" +#include "asterisk/dsp.h" #include #include Index: apps/app_test.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_test.c,v retrieving revision 1.7 diff -u -r1.7 app_test.c --- apps/app_test.c 3 Apr 2005 20:25:43 -0000 1.7 +++ apps/app_test.c 21 Apr 2005 05:23:57 -0000 @@ -14,19 +14,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" +#include "asterisk/pbx.h" +#include "asterisk/utils.h" #include #include #include #include -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Interface Test Application"; Index: apps/app_transfer.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_transfer.c,v retrieving revision 1.8 diff -u -r1.8 app_transfer.c --- apps/app_transfer.c 20 Mar 2005 03:43:37 -0000 1.8 +++ apps/app_transfer.c 21 Apr 2005 05:23:57 -0000 @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" #include #include #include Index: apps/app_txtcidname.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_txtcidname.c,v retrieving revision 1.10 diff -u -r1.10 app_txtcidname.c --- apps/app_txtcidname.c 25 Jan 2005 06:10:19 -0000 1.10 +++ apps/app_txtcidname.c 21 Apr 2005 05:23:57 -0000 @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/enum.h" +#include "asterisk/utils.h" #include #include #include Index: apps/app_url.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_url.c,v retrieving revision 1.7 diff -u -r1.7 app_url.c --- apps/app_url.c 21 Jan 2005 07:06:24 -0000 1.7 +++ apps/app_url.c 21 Apr 2005 05:23:57 -0000 @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include #include Index: apps/app_userevent.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_userevent.c,v retrieving revision 1.3 diff -u -r1.3 app_userevent.c --- apps/app_userevent.c 24 Oct 2004 03:17:37 -0000 1.3 +++ apps/app_userevent.c 21 Apr 2005 05:23:57 -0000 @@ -8,13 +8,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" #include #include #include Index: apps/app_verbose.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_verbose.c,v retrieving revision 1.3 diff -u -r1.3 app_verbose.c --- apps/app_verbose.c 21 Jan 2005 07:06:24 -0000 1.3 +++ apps/app_verbose.c 21 Apr 2005 05:23:57 -0000 @@ -15,11 +15,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" static char *tdesc = "Send verbose output"; Index: apps/app_voicemail.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v retrieving revision 1.206 diff -u -r1.206 app_voicemail.c --- apps/app_voicemail.c 13 Apr 2005 05:22:51 -0000 1.206 +++ apps/app_voicemail.c 21 Apr 2005 05:23:59 -0000 @@ -14,24 +14,24 @@ * George Konstantoulakis */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/adsi.h" +#include "asterisk/app.h" +#include "asterisk/manager.h" +#include "asterisk/dsp.h" +#include "asterisk/localtime.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #ifdef USE_ODBC_STORAGE -#include +#include "asterisk/res_odbc.h" #endif #include #include @@ -46,8 +46,8 @@ #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #define COMMAND_TIMEOUT 5000 Index: apps/app_waitforring.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_waitforring.c,v retrieving revision 1.4 diff -u -r1.4 app_waitforring.c --- apps/app_waitforring.c 22 Jun 2004 19:32:52 -0000 1.4 +++ apps/app_waitforring.c 21 Apr 2005 05:23:59 -0000 @@ -12,13 +12,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_waitforsilence.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_waitforsilence.c,v retrieving revision 1.5 diff -u -r1.5 app_waitforsilence.c --- apps/app_waitforsilence.c 12 Mar 2005 06:00:05 -0000 1.5 +++ apps/app_waitforsilence.c 21 Apr 2005 05:23:59 -0000 @@ -17,13 +17,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/dsp.h" +#include "asterisk/module.h" +#include "asterisk/options.h" #include #include #include Index: apps/app_while.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_while.c,v retrieving revision 1.5 diff -u -r1.5 app_while.c --- apps/app_while.c 29 Mar 2005 06:18:58 -0000 1.5 +++ apps/app_while.c 21 Apr 2005 05:23:59 -0000 @@ -12,14 +12,14 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include #include #include Index: apps/app_zapateller.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_zapateller.c,v retrieving revision 1.7 diff -u -r1.7 app_zapateller.c --- apps/app_zapateller.c 21 Jan 2005 07:06:24 -0000 1.7 +++ apps/app_zapateller.c 21 Apr 2005 05:23:59 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include #include Index: apps/app_zapbarge.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_zapbarge.c,v retrieving revision 1.7 diff -u -r1.7 app_zapbarge.c --- apps/app_zapbarge.c 14 Jul 2004 07:34:34 -0000 1.7 +++ apps/app_zapbarge.c 21 Apr 2005 05:23:59 -0000 @@ -14,18 +14,18 @@ * GPL application. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/app.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" #include #include #include Index: apps/app_zapras.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_zapras.c,v retrieving revision 1.8 diff -u -r1.8 app_zapras.c --- apps/app_zapras.c 22 Jun 2004 19:32:52 -0000 1.8 +++ apps/app_zapras.c 21 Apr 2005 05:24:00 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" #include #include #ifdef __linux__ Index: apps/app_zapscan.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_zapscan.c,v retrieving revision 1.15 diff -u -r1.15 app_zapscan.c --- apps/app_zapscan.c 21 Dec 2004 01:21:12 -0000 1.15 +++ apps/app_zapscan.c 21 Apr 2005 05:24:00 -0000 @@ -16,18 +16,18 @@ * GPL application. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/app.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" #include #include #include Index: cdr/cdr_csv.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_csv.c,v retrieving revision 1.13 diff -u -r1.13 cdr_csv.c --- cdr/cdr_csv.c 21 Jan 2005 07:06:24 -0000 1.13 +++ cdr/cdr_csv.c 21 Apr 2005 05:24:00 -0000 @@ -15,13 +15,13 @@ */ #include -#include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #define CSV_LOG_DIR "/cdr-csv" #define CSV_MASTER "/Master.csv" Index: cdr/cdr_custom.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_custom.c,v retrieving revision 1.8 diff -u -r1.8 cdr_custom.c --- cdr/cdr_custom.c 6 Apr 2005 16:14:21 -0000 1.8 +++ cdr/cdr_custom.c 21 Apr 2005 05:24:00 -0000 @@ -15,15 +15,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/pbx.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #define CUSTOM_LOG_DIR "/cdr_custom" Index: cdr/cdr_manager.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_manager.c,v retrieving revision 1.2 diff -u -r1.2 cdr_manager.c --- cdr/cdr_manager.c 25 Jan 2005 06:10:19 -0000 1.2 +++ cdr/cdr_manager.c 21 Apr 2005 05:24:00 -0000 @@ -9,15 +9,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/manager.h" +#include "asterisk/config.h" +#include "asterisk.h" +#include "astconf.h" #include #include #include Index: cdr/cdr_odbc.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_odbc.c,v retrieving revision 1.24 diff -u -r1.24 cdr_odbc.c --- cdr/cdr_odbc.c 4 Feb 2005 05:52:45 -0000 1.24 +++ cdr/cdr_odbc.c 21 Apr 2005 05:24:00 -0000 @@ -12,13 +12,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include #include Index: cdr/cdr_pgsql.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v retrieving revision 1.15 diff -u -r1.15 cdr_pgsql.c --- cdr/cdr_pgsql.c 19 Feb 2005 20:10:52 -0000 1.15 +++ cdr/cdr_pgsql.c 21 Apr 2005 05:24:00 -0000 @@ -15,13 +15,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include #include Index: cdr/cdr_sqlite.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_sqlite.c,v retrieving revision 1.5 diff -u -r1.5 cdr_sqlite.c --- cdr/cdr_sqlite.c 11 Mar 2005 06:20:08 -0000 1.5 +++ cdr/cdr_sqlite.c 21 Apr 2005 05:24:00 -0000 @@ -14,12 +14,12 @@ */ #include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #include #include Index: cdr/cdr_tds.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_tds.c,v retrieving revision 1.7 diff -u -r1.7 cdr_tds.c --- cdr/cdr_tds.c 7 Apr 2005 14:53:17 -0000 1.7 +++ cdr/cdr_tds.c 21 Apr 2005 05:24:00 -0000 @@ -35,13 +35,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include #include Index: channels/chan_agent.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v retrieving revision 1.132 diff -u -r1.132 chan_agent.c --- channels/chan_agent.c 15 Apr 2005 06:55:21 -0000 1.132 +++ channels/chan_agent.c 21 Apr 2005 05:24:01 -0000 @@ -13,28 +13,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/features.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astdb.h" #include #include #include Index: channels/chan_alsa.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v retrieving revision 1.41 diff -u -r1.41 chan_alsa.c --- channels/chan_alsa.c 13 Apr 2005 16:24:45 -0000 1.41 +++ channels/chan_alsa.c 21 Apr 2005 05:24:01 -0000 @@ -9,17 +9,17 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" #include #include #include Index: channels/chan_features.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_features.c,v retrieving revision 1.6 diff -u -r1.6 chan_features.c --- channels/chan_features.c 4 Mar 2005 06:47:24 -0000 1.6 +++ channels/chan_features.c 21 Apr 2005 05:24:01 -0000 @@ -13,24 +13,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" #include #include #include Index: channels/chan_h323.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v retrieving revision 1.107 diff -u -r1.107 chan_h323.c --- channels/chan_h323.c 4 Apr 2005 15:54:34 -0000 1.107 +++ channels/chan_h323.c 21 Apr 2005 05:24:03 -0000 @@ -49,23 +49,23 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/dsp.h" +#include "asterisk/causes.h" #ifdef __cplusplus } #endif Index: channels/chan_iax2.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.271 diff -u -r1.271 chan_iax2.c --- channels/chan_iax2.c 13 Apr 2005 23:33:47 -0000 1.271 +++ channels/chan_iax2.c 21 Apr 2005 05:24:06 -0000 @@ -11,33 +11,33 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/translate.h" +#include "asterisk/md5.h" +#include "asterisk/cdr.h" +#include "asterisk/crypto.h" +#include "asterisk/acl.h" +#include "asterisk/manager.h" +#include "asterisk/callerid.h" +#include "asterisk/app.h" +#include "asterisk/astdb.h" +#include "asterisk/musiconhold.h" +#include "asterisk/features.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/localtime.h" +#include "asterisk/aes.h" +#include "asterisk/dnsmgr.h" #include #include #include @@ -69,7 +69,7 @@ #include "iax2.h" #include "iax2-parser.h" #include "iax2-provision.h" -#include "../astconf.h" +#include "astconf.h" /* Define NEWJB to use the new channel independent jitterbuffer, * otherwise, use the old jitterbuffer */ Index: channels/chan_local.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_local.c,v retrieving revision 1.45 diff -u -r1.45 chan_local.c --- channels/chan_local.c 28 Mar 2005 20:48:24 -0000 1.45 +++ channels/chan_local.c 21 Apr 2005 05:24:06 -0000 @@ -13,24 +13,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" #include #include #include Index: channels/chan_mgcp.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v retrieving revision 1.115 diff -u -r1.115 chan_mgcp.c --- channels/chan_mgcp.c 11 Apr 2005 05:48:58 -0000 1.115 +++ channels/chan_mgcp.c 21 Apr 2005 05:24:08 -0000 @@ -55,28 +55,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/cdr.h" +#include "asterisk/astdb.h" +#include "asterisk/features.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" #include #include #include @@ -91,7 +91,7 @@ #include #include -#include +#include "asterisk/dsp.h" #include #ifndef IPTOS_MINCOST Index: channels/chan_modem.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_modem.c,v retrieving revision 1.38 diff -u -r1.38 chan_modem.c --- channels/chan_modem.c 4 Mar 2005 06:47:24 -0000 1.38 +++ channels/chan_modem.c 21 Apr 2005 05:24:08 -0000 @@ -13,15 +13,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/vmodem.h" +#include "asterisk/utils.h" #include #include #include Index: channels/chan_modem_aopen.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_modem_aopen.c,v retrieving revision 1.13 diff -u -r1.13 chan_modem_aopen.c --- channels/chan_modem_aopen.c 24 Jun 2004 13:27:44 -0000 1.13 +++ channels/chan_modem_aopen.c 21 Apr 2005 05:24:08 -0000 @@ -16,12 +16,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 Index: channels/chan_modem_bestdata.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_modem_bestdata.c,v retrieving revision 1.14 diff -u -r1.14 chan_modem_bestdata.c --- channels/chan_modem_bestdata.c 25 Feb 2005 17:32:37 -0000 1.14 +++ channels/chan_modem_bestdata.c 21 Apr 2005 05:24:08 -0000 @@ -18,12 +18,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 Index: channels/chan_modem_i4l.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_modem_i4l.c,v retrieving revision 1.24 diff -u -r1.24 chan_modem_i4l.c --- channels/chan_modem_i4l.c 26 Mar 2005 07:12:19 -0000 1.24 +++ channels/chan_modem_i4l.c 21 Apr 2005 05:24:08 -0000 @@ -18,16 +18,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/dsp.h" +#include "asterisk/callerid.h" +#include "asterisk/ulaw.h" +#include "asterisk/pbx.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 Index: channels/chan_nbs.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_nbs.c,v retrieving revision 1.13 diff -u -r1.13 chan_nbs.c --- channels/chan_nbs.c 4 Mar 2005 06:47:24 -0000 1.13 +++ channels/chan_nbs.c 21 Apr 2005 05:24:08 -0000 @@ -13,13 +13,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" #include #include #include Index: channels/chan_oss.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v retrieving revision 1.46 diff -u -r1.46 chan_oss.c --- channels/chan_oss.c 29 Mar 2005 04:49:24 -0000 1.46 +++ channels/chan_oss.c 21 Apr 2005 05:24:09 -0000 @@ -15,18 +15,18 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" #include #include #include Index: channels/chan_phone.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v retrieving revision 1.49 diff -u -r1.49 chan_phone.c --- channels/chan_phone.c 4 Apr 2005 02:13:40 -0000 1.49 +++ channels/chan_phone.c 21 Apr 2005 05:24:10 -0000 @@ -14,16 +14,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/callerid.h" +#include "asterisk/causes.h" #include #include #include Index: channels/chan_sip.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v retrieving revision 1.704 diff -u -r1.704 chan_sip.c --- channels/chan_sip.c 13 Apr 2005 18:46:35 -0000 1.704 +++ channels/chan_sip.c 21 Apr 2005 05:24:13 -0000 @@ -15,35 +15,35 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/manager.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/dsp.h" +#include "asterisk/features.h" +#include "asterisk/acl.h" +#include "asterisk/srv.h" +#include "asterisk/astdb.h" +#include "asterisk/causes.h" +#include "asterisk/utils.h" +#include "asterisk/file.h" +#include "asterisk/astobj.h" +#include "asterisk/dnsmgr.h" #ifdef OSP_SUPPORT -#include +#include "asterisk/astosp.h" #endif #include #include Index: channels/chan_skinny.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v retrieving revision 1.70 diff -u -r1.70 chan_skinny.c --- channels/chan_skinny.c 13 Apr 2005 23:33:47 -0000 1.70 +++ channels/chan_skinny.c 21 Apr 2005 05:24:14 -0000 @@ -16,27 +16,27 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/cdr.h" +#include "asterisk/astdb.h" +#include "asterisk/features.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/utils.h" #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include "asterisk/dsp.h" #include /************************************************************************************/ Index: channels/chan_vpb.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v retrieving revision 1.80 diff -u -r1.80 chan_vpb.c --- channels/chan_vpb.c 13 Apr 2005 04:15:23 -0000 1.80 +++ channels/chan_vpb.c 21 Apr 2005 05:24:15 -0000 @@ -22,17 +22,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/callerid.h" +#include "asterisk/dsp.h" +#include "asterisk/features.h" } Index: channels/chan_zap.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v retrieving revision 1.427 diff -u -r1.427 chan_zap.c --- channels/chan_zap.c 13 Apr 2005 23:33:47 -0000 1.427 +++ channels/chan_zap.c 21 Apr 2005 05:24:19 -0000 @@ -13,32 +13,32 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/file.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/adsi.h" +#include "asterisk/cli.h" +#include "asterisk/cdr.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/say.h" +#include "asterisk/tdd.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/astdb.h" +#include "asterisk/manager.h" +#include "asterisk/causes.h" +#include "asterisk/term.h" +#include "asterisk/utils.h" +#include "asterisk/transcap.h" #include #include #include @@ -65,7 +65,7 @@ #include #endif -#include "../asterisk.h" +#include "asterisk.h" #ifndef ZT_SIG_EM_E1 #error "Your zaptel is too old. please cvs update" Index: channels/iax2-parser.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v retrieving revision 1.41 diff -u -r1.41 iax2-parser.c --- channels/iax2-parser.c 4 Apr 2005 02:13:40 -0000 1.41 +++ channels/iax2-parser.c 21 Apr 2005 05:24:19 -0000 @@ -15,9 +15,9 @@ #include #include #include -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/utils.h" +#include "asterisk/unaligned.h" #include #include #include Index: channels/iax2-provision.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/iax2-provision.c,v retrieving revision 1.9 diff -u -r1.9 iax2-provision.c --- channels/iax2-provision.c 25 Jan 2005 06:10:20 -0000 1.9 +++ channels/iax2-provision.c 21 Apr 2005 05:24:19 -0000 @@ -12,19 +12,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/options.h" +#include "asterisk/md5.h" +#include "asterisk/astdb.h" #include #include #include #include -#include +#include "asterisk/utils.h" #include #include #include Index: channels/h323/ast_h323.cpp =================================================================== RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v retrieving revision 1.70 diff -u -r1.70 ast_h323.cpp --- channels/h323/ast_h323.cpp 4 Apr 2005 07:06:26 -0000 1.70 +++ channels/h323/ast_h323.cpp 21 Apr 2005 05:24:20 -0000 @@ -40,7 +40,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include "asterisk/logger.h" #ifdef __cplusplus } #endif Index: codecs/codec_a_mu.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_a_mu.c,v retrieving revision 1.7 diff -u -r1.7 codec_a_mu.c --- codecs/codec_a_mu.c 22 Jun 2004 18:49:00 -0000 1.7 +++ codecs/codec_a_mu.c 21 Apr 2005 05:24:20 -0000 @@ -10,13 +10,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/alaw.h" +#include "asterisk/ulaw.h" #include #include #include Index: codecs/codec_adpcm.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v retrieving revision 1.16 diff -u -r1.16 codec_adpcm.c --- codecs/codec_adpcm.c 12 Apr 2005 02:41:29 -0000 1.16 +++ codecs/codec_adpcm.c 21 Apr 2005 05:24:20 -0000 @@ -14,13 +14,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_alaw.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_alaw.c,v retrieving revision 1.9 diff -u -r1.9 codec_alaw.c --- codecs/codec_alaw.c 12 Apr 2005 02:41:29 -0000 1.9 +++ codecs/codec_alaw.c 21 Apr 2005 05:24:20 -0000 @@ -10,14 +10,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/alaw.h" #include #include #include Index: codecs/codec_g723_1.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_g723_1.c,v retrieving revision 1.15 diff -u -r1.15 codec_g723_1.c --- codecs/codec_g723_1.c 22 Jun 2004 18:49:00 -0000 1.15 +++ codecs/codec_g723_1.c 21 Apr 2005 05:24:20 -0000 @@ -22,11 +22,11 @@ #define TYPE_MASK 0x3 #include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_g726.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v retrieving revision 1.8 diff -u -r1.8 codec_g726.c --- codecs/codec_g726.c 12 Apr 2005 02:41:29 -0000 1.8 +++ codecs/codec_g726.c 21 Apr 2005 05:24:20 -0000 @@ -13,13 +13,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_gsm.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_gsm.c,v retrieving revision 1.15 diff -u -r1.15 codec_gsm.c --- codecs/codec_gsm.c 12 Apr 2005 02:41:29 -0000 1.15 +++ codecs/codec_gsm.c 21 Apr 2005 05:24:20 -0000 @@ -14,13 +14,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_ilbc.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_ilbc.c,v retrieving revision 1.9 diff -u -r1.9 codec_ilbc.c --- codecs/codec_ilbc.c 17 Mar 2005 21:30:19 -0000 1.9 +++ codecs/codec_ilbc.c 21 Apr 2005 05:24:20 -0000 @@ -13,11 +13,11 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_lpc10.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v retrieving revision 1.13 diff -u -r1.13 codec_lpc10.c --- codecs/codec_lpc10.c 12 Apr 2005 02:41:29 -0000 1.13 +++ codecs/codec_lpc10.c 21 Apr 2005 05:24:20 -0000 @@ -17,13 +17,13 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_speex.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_speex.c,v retrieving revision 1.11 diff -u -r1.11 codec_speex.c --- codecs/codec_speex.c 17 Mar 2005 21:30:19 -0000 1.11 +++ codecs/codec_speex.c 21 Apr 2005 05:24:21 -0000 @@ -28,13 +28,13 @@ #define TYPE_LOW 0x1 #define TYPE_MASK 0x3 -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include #include #include Index: codecs/codec_ulaw.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_ulaw.c,v retrieving revision 1.10 diff -u -r1.10 codec_ulaw.c --- codecs/codec_ulaw.c 12 Apr 2005 02:41:29 -0000 1.10 +++ codecs/codec_ulaw.c 21 Apr 2005 05:24:21 -0000 @@ -10,14 +10,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/ulaw.h" #include #include #include Index: formats/format_g723.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_g723.c,v retrieving revision 1.17 diff -u -r1.17 format_g723.c --- formats/format_g723.c 18 Jan 2005 11:40:44 -0000 1.17 +++ formats/format_g723.c 21 Apr 2005 05:24:21 -0000 @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" #include #include #include Index: formats/format_g726.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_g726.c,v retrieving revision 1.8 diff -u -r1.8 format_g726.c --- formats/format_g726.c 29 Mar 2005 04:49:24 -0000 1.8 +++ formats/format_g726.c 21 Apr 2005 05:24:21 -0000 @@ -9,14 +9,14 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_g729.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v retrieving revision 1.17 diff -u -r1.17 format_g729.c --- formats/format_g729.c 29 Mar 2005 04:49:24 -0000 1.17 +++ formats/format_g729.c 21 Apr 2005 05:24:21 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_gsm.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v retrieving revision 1.22 diff -u -r1.22 format_gsm.c --- formats/format_gsm.c 29 Mar 2005 04:49:24 -0000 1.22 +++ formats/format_gsm.c 21 Apr 2005 05:24:21 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_h263.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_h263.c,v retrieving revision 1.9 diff -u -r1.9 format_h263.c --- formats/format_h263.c 29 Mar 2005 04:49:24 -0000 1.9 +++ formats/format_h263.c 21 Apr 2005 05:24:21 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_ilbc.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v retrieving revision 1.10 diff -u -r1.10 format_ilbc.c --- formats/format_ilbc.c 29 Mar 2005 04:49:24 -0000 1.10 +++ formats/format_ilbc.c 21 Apr 2005 05:24:21 -0000 @@ -13,13 +13,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_jpeg.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_jpeg.c,v retrieving revision 1.8 diff -u -r1.8 format_jpeg.c --- formats/format_jpeg.c 29 Mar 2005 04:49:24 -0000 1.8 +++ formats/format_jpeg.c 21 Apr 2005 05:24:21 -0000 @@ -12,14 +12,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/image.h" +#include "asterisk/lock.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_pcm.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_pcm.c,v retrieving revision 1.18 diff -u -r1.18 format_pcm.c --- formats/format_pcm.c 29 Mar 2005 04:49:24 -0000 1.18 +++ formats/format_pcm.c 21 Apr 2005 05:24:21 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_pcm_alaw.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_pcm_alaw.c,v retrieving revision 1.16 diff -u -r1.16 format_pcm_alaw.c --- formats/format_pcm_alaw.c 29 Mar 2005 04:49:24 -0000 1.16 +++ formats/format_pcm_alaw.c 21 Apr 2005 05:24:22 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_sln.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_sln.c,v retrieving revision 1.5 diff -u -r1.5 format_sln.c --- formats/format_sln.c 29 Mar 2005 04:49:24 -0000 1.5 +++ formats/format_sln.c 21 Apr 2005 05:24:22 -0000 @@ -9,13 +9,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_vox.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_vox.c,v retrieving revision 1.19 diff -u -r1.19 format_vox.c --- formats/format_vox.c 29 Mar 2005 04:49:24 -0000 1.19 +++ formats/format_vox.c 21 Apr 2005 05:24:22 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_wav.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_wav.c,v retrieving revision 1.22 diff -u -r1.22 format_wav.c --- formats/format_wav.c 29 Mar 2005 04:49:24 -0000 1.22 +++ formats/format_wav.c 21 Apr 2005 05:24:22 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: formats/format_wav_gsm.c =================================================================== RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v retrieving revision 1.31 diff -u -r1.31 format_wav_gsm.c --- formats/format_wav_gsm.c 29 Mar 2005 04:49:24 -0000 1.31 +++ formats/format_wav_gsm.c 21 Apr 2005 05:24:22 -0000 @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" +#include "asterisk/endian.h" #include #include #include Index: include/asterisk/acl.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/acl.h,v retrieving revision 1.11 diff -u -r1.11 acl.h --- include/asterisk/acl.h 9 Mar 2005 05:48:11 -0000 1.11 +++ include/asterisk/acl.h 21 Apr 2005 05:24:22 -0000 @@ -20,8 +20,8 @@ #endif #include -#include -#include +#include "asterisk/io.h" +#include "asterisk/astobj.h" #define AST_SENSE_DENY 0 #define AST_SENSE_ALLOW 1 Index: include/asterisk/adsi.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/adsi.h,v retrieving revision 1.7 diff -u -r1.7 adsi.h --- include/asterisk/adsi.h 6 Apr 2005 05:11:48 -0000 1.7 +++ include/asterisk/adsi.h 21 Apr 2005 05:24:22 -0000 @@ -16,7 +16,7 @@ #ifndef _ADSI_H #define _ADSI_H -#include +#include "asterisk/callerid.h" /* ADSI Message types */ #define ADSI_MSG_DISPLAY 132 Index: include/asterisk/astobj.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/astobj.h,v retrieving revision 1.11 diff -u -r1.11 astobj.h --- include/asterisk/astobj.h 21 Jan 2005 07:06:25 -0000 1.11 +++ include/asterisk/astobj.h 21 Apr 2005 05:24:22 -0000 @@ -15,7 +15,7 @@ #define _ASTERISK_ASTOBJ_H #include -#include +#include "asterisk/lock.h" /*! \file astobj.h Index: include/asterisk/astosp.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/astosp.h,v retrieving revision 1.2 diff -u -r1.2 astosp.h --- include/asterisk/astosp.h 25 Jun 2004 05:52:55 -0000 1.2 +++ include/asterisk/astosp.h 21 Apr 2005 05:24:22 -0000 @@ -13,7 +13,7 @@ #ifndef _ASTERISK_OSP_H #define _ASTERISK_OSP_H -#include +#include "asterisk/channel.h" #include #include Index: include/asterisk/cdr.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/cdr.h,v retrieving revision 1.22 diff -u -r1.22 cdr.h --- include/asterisk/cdr.h 29 Mar 2005 06:16:49 -0000 1.22 +++ include/asterisk/cdr.h 21 Apr 2005 05:24:22 -0000 @@ -17,7 +17,7 @@ #ifndef _CDR_H #define _CDR_H -#include +#include "asterisk/channel.h" #include #define AST_CDR_FLAG_KEEP_VARS (1 << 0) #define AST_CDR_FLAG_POSTED (1 << 1) Index: include/asterisk/channel.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v retrieving revision 1.81 diff -u -r1.81 channel.h --- include/asterisk/channel.h 1 Apr 2005 17:00:50 -0000 1.81 +++ include/asterisk/channel.h 21 Apr 2005 05:24:23 -0000 @@ -17,14 +17,14 @@ #ifdef SOLARIS #include #endif -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/chanvars.h" #include #include #if defined(__APPLE__) -#include +#include "asterisk/poll-compat.h" #else #include #endif @@ -33,14 +33,14 @@ extern "C" { #endif -#include +#include "asterisk/lock.h" /*! Max length of an extension */ #define AST_MAX_EXTENSION 80 -#include -#include -#include +#include "asterisk/cdr.h" +#include "asterisk/monitor.h" +#include "asterisk/utils.h" #define AST_CHANNEL_NAME 80 Index: include/asterisk/chanvars.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/chanvars.h,v retrieving revision 1.5 diff -u -r1.5 chanvars.h --- include/asterisk/chanvars.h 1 Nov 2004 15:48:42 -0000 1.5 +++ include/asterisk/chanvars.h 21 Apr 2005 05:24:23 -0000 @@ -14,7 +14,7 @@ #ifndef _ASTERISK_CHANVARS_INCLUDE #define _ASTERISK_CHANVARS_INCLUDE -#include +#include "asterisk/linkedlists.h" struct ast_var_t { AST_LIST_ENTRY(ast_var_t) entries; Index: include/asterisk/config.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/config.h,v retrieving revision 1.19 diff -u -r1.19 config.h --- include/asterisk/config.h 26 Jan 2005 02:39:22 -0000 1.19 +++ include/asterisk/config.h 21 Apr 2005 05:24:23 -0000 @@ -36,7 +36,7 @@ char stuff[0]; }; -#include +#include "asterisk/config_old.h" typedef struct ast_config *config_load_func(const char *database, const char *table, const char *configfile, struct ast_config *config); typedef struct ast_variable *realtime_var_get(const char *database, const char *table, va_list ap); Index: include/asterisk/crypto.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/crypto.h,v retrieving revision 1.5 diff -u -r1.5 crypto.h --- include/asterisk/crypto.h 15 Jan 2005 23:48:12 -0000 1.5 +++ include/asterisk/crypto.h 21 Apr 2005 05:24:23 -0000 @@ -14,8 +14,8 @@ #ifndef _ASTERISK_CRYPTO_H #define _ASTERISK_CRYPTO_H -#include -#include +#include "asterisk/channel.h" +#include "asterisk/file.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { Index: include/asterisk/cvsid.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/cvsid.h,v retrieving revision 1.3 diff -u -r1.3 cvsid.h --- include/asterisk/cvsid.h 21 Jan 2005 07:06:25 -0000 1.3 +++ include/asterisk/cvsid.h 21 Apr 2005 05:24:23 -0000 @@ -35,7 +35,7 @@ /* * To use this macro, in the source file put the lines: * - * #include + * #include "asterisk/cvsid.h" * #ifndef lint * CVSID("$Id: cvsid.h,v 1.3 2005/01/21 07:06:25 russell Exp $"); * #endif Index: include/asterisk/dundi.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/dundi.h,v retrieving revision 1.8 diff -u -r1.8 dundi.h --- include/asterisk/dundi.h 13 Apr 2005 23:33:47 -0000 1.8 +++ include/asterisk/dundi.h 21 Apr 2005 05:24:23 -0000 @@ -11,7 +11,7 @@ #ifndef _ASTERISK_DUNDI_H #define _ASTERISK_DUNDI_H -#include +#include "asterisk/channel.h" #define DUNDI_PORT 4520 Index: include/asterisk/enum.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/enum.h,v retrieving revision 1.4 diff -u -r1.4 enum.h --- include/asterisk/enum.h 2 Mar 2005 05:17:13 -0000 1.4 +++ include/asterisk/enum.h 21 Apr 2005 05:24:23 -0000 @@ -17,7 +17,7 @@ #ifndef _ASTERISK_ENUM_H #define _ASTERISK_ENUM_H -#include +#include "asterisk/channel.h" /*! \brief Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup \param chan Channel \param number Number in E164 format without the + (for e164.arpa) or format Index: include/asterisk/file.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/file.h,v retrieving revision 1.22 diff -u -r1.22 file.h --- include/asterisk/file.h 13 Feb 2005 17:02:39 -0000 1.22 +++ include/asterisk/file.h 21 Apr 2005 05:24:23 -0000 @@ -14,8 +14,8 @@ #ifndef _ASTERISK_FILE_H #define _ASTERISK_FILE_H -#include -#include +#include "asterisk/channel.h" +#include "asterisk/frame.h" #include Index: include/asterisk/frame.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/frame.h,v retrieving revision 1.48 diff -u -r1.48 frame.h --- include/asterisk/frame.h 5 Apr 2005 17:04:51 -0000 1.48 +++ include/asterisk/frame.h 21 Apr 2005 05:24:23 -0000 @@ -22,7 +22,7 @@ #include #include -#include +#include "asterisk/endian.h" struct ast_codec_pref { char order[32]; Index: include/asterisk/indications.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/indications.h,v retrieving revision 1.3 diff -u -r1.3 indications.h --- include/asterisk/indications.h 13 Aug 2003 15:25:16 -0000 1.3 +++ include/asterisk/indications.h 21 Apr 2005 05:24:23 -0000 @@ -22,7 +22,7 @@ #ifndef _ASTERISK_INDICATIONS_H #define _ASTERISK_INDICATIONS_H -#include +#include "asterisk/lock.h" /* forward reference */ struct ast_channel; Index: include/asterisk/io.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/io.h,v retrieving revision 1.6 diff -u -r1.6 io.h --- include/asterisk/io.h 15 Jan 2005 23:48:12 -0000 1.6 +++ include/asterisk/io.h 21 Apr 2005 05:24:23 -0000 @@ -15,7 +15,7 @@ #define _IO_H #ifdef __APPLE__ -#include +#include "asterisk/poll-compat.h" #else #include /* For POLL* constants */ #endif Index: include/asterisk/linkedlists.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/linkedlists.h,v retrieving revision 1.11 diff -u -r1.11 linkedlists.h --- include/asterisk/linkedlists.h 6 Apr 2005 02:06:27 -0000 1.11 +++ include/asterisk/linkedlists.h 21 Apr 2005 05:24:23 -0000 @@ -1,7 +1,7 @@ #ifndef ASTERISK_LINKEDLISTS_H #define ASTERISK_LINKEDLISTS_H -#include +#include "asterisk/lock.h" /*! \file linkedlists.h Index: include/asterisk/manager.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/manager.h,v retrieving revision 1.13 diff -u -r1.13 manager.h --- include/asterisk/manager.h 22 Mar 2005 19:09:12 -0000 1.13 +++ include/asterisk/manager.h 21 Apr 2005 05:24:23 -0000 @@ -23,7 +23,7 @@ #include #include -#include +#include "asterisk/lock.h" /*! \file manager.h Index: include/asterisk/monitor.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/monitor.h,v retrieving revision 1.3 diff -u -r1.3 monitor.h --- include/asterisk/monitor.h 15 Jan 2005 23:48:12 -0000 1.3 +++ include/asterisk/monitor.h 21 Apr 2005 05:24:23 -0000 @@ -3,7 +3,7 @@ #include -#include +#include "asterisk/channel.h" struct ast_channel; Index: include/asterisk/pbx.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/pbx.h,v retrieving revision 1.43 diff -u -r1.43 pbx.h --- include/asterisk/pbx.h 29 Mar 2005 06:16:49 -0000 1.43 +++ include/asterisk/pbx.h 21 Apr 2005 05:24:24 -0000 @@ -13,8 +13,8 @@ #ifndef _ASTERISK_PBX_H #define _ASTERISK_PBX_H -#include -#include +#include "asterisk/sched.h" +#include "asterisk/channel.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { Index: include/asterisk/rtp.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/rtp.h,v retrieving revision 1.21 diff -u -r1.21 rtp.h --- include/asterisk/rtp.h 5 Apr 2005 23:34:56 -0000 1.21 +++ include/asterisk/rtp.h 21 Apr 2005 05:24:24 -0000 @@ -14,10 +14,10 @@ #ifndef _ASTERISK_RTP_H #define _ASTERISK_RTP_H -#include -#include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/io.h" +#include "asterisk/sched.h" +#include "asterisk/channel.h" #include Index: include/asterisk/say.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/say.h,v retrieving revision 1.11 diff -u -r1.11 say.h --- include/asterisk/say.h 13 Nov 2004 16:13:07 -0000 1.11 +++ include/asterisk/say.h 21 Apr 2005 05:24:24 -0000 @@ -14,8 +14,8 @@ #ifndef _ASTERISK_SAY_H #define _ASTERISK_SAY_H -#include -#include +#include "asterisk/channel.h" +#include "asterisk/file.h" #include Index: include/asterisk/translate.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/translate.h,v retrieving revision 1.7 diff -u -r1.7 translate.h --- include/asterisk/translate.h 17 Mar 2005 21:30:19 -0000 1.7 +++ include/asterisk/translate.h 21 Apr 2005 05:24:24 -0000 @@ -20,8 +20,8 @@ extern "C" { #endif -#include -#include +#include "asterisk/frame.h" +#include "asterisk/plc.h" /* Declared by individual translators */ struct ast_translator_pvt; Index: include/asterisk/utils.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v retrieving revision 1.27 diff -u -r1.27 utils.h --- include/asterisk/utils.h 17 Mar 2005 23:12:15 -0000 1.27 +++ include/asterisk/utils.h 21 Apr 2005 05:24:24 -0000 @@ -18,7 +18,7 @@ #include #include #include -#include +#include "asterisk/lock.h" #include /* Note: Index: include/asterisk/vmodem.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/vmodem.h,v retrieving revision 1.18 diff -u -r1.18 vmodem.h --- include/asterisk/vmodem.h 26 Mar 2005 07:12:19 -0000 1.18 +++ include/asterisk/vmodem.h 21 Apr 2005 05:24:24 -0000 @@ -14,8 +14,8 @@ #ifndef _ASTERISK_VMODEM_H #define _ASTERISK_VMODEM_H -#include -#include +#include "asterisk/frame.h" +#include "asterisk/channel.h" #define CHAR_DLE 0x10 #define CHAR_ETX 0x03 Index: pbx/dundi-parser.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/dundi-parser.c,v retrieving revision 1.6 diff -u -r1.6 dundi-parser.c --- pbx/dundi-parser.c 21 Jan 2005 07:06:25 -0000 1.6 +++ pbx/dundi-parser.c 21 Apr 2005 05:24:24 -0000 @@ -13,15 +13,15 @@ #include #include #include -#include -#include +#include "asterisk/frame.h" +#include "asterisk/utils.h" #include #include #include #include -#include +#include "asterisk/dundi.h" #include "dundi-parser.h" -#include +#include "asterisk/dundi.h" static void internaloutput(const char *str) { Index: pbx/dundi-parser.h =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/dundi-parser.h,v retrieving revision 1.3 diff -u -r1.3 dundi-parser.h --- pbx/dundi-parser.h 21 Jan 2005 07:06:25 -0000 1.3 +++ pbx/dundi-parser.h 21 Apr 2005 05:24:24 -0000 @@ -12,8 +12,8 @@ #ifndef _DUNDI_PARSER_H #define _DUNDI_PARSER_H -#include -#include +#include "asterisk/dundi.h" +#include "asterisk/aes.h" #define DUNDI_MAX_STACK 512 #define DUNDI_MAX_ANSWERS 100 Index: pbx/pbx_config.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v retrieving revision 1.56 diff -u -r1.56 pbx_config.c --- pbx/pbx_config.c 15 Apr 2005 06:08:47 -0000 1.56 +++ pbx/pbx_config.c 21 Apr 2005 05:24:25 -0000 @@ -12,20 +12,20 @@ */ #include -#include -#include -#include -#include -#include -#include +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/cli.h" +#include "asterisk/callerid.h" #include #include #include #include #include /* For where to put dynamic tables */ -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #ifdef __AST_DEBUG_MALLOC static void FREE(void *ptr) Index: pbx/pbx_dundi.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v retrieving revision 1.31 diff -u -r1.31 pbx_dundi.c --- pbx/pbx_dundi.c 13 Apr 2005 04:47:38 -0000 1.31 +++ pbx/pbx_dundi.c 21 Apr 2005 05:24:26 -0000 @@ -9,26 +9,26 @@ * of the GNU General Public License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/dundi.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" +#include "asterisk/acl.h" +#include "asterisk/aes.h" #include "dundi-parser.h" #include Index: pbx/pbx_gtkconsole.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_gtkconsole.c,v retrieving revision 1.15 diff -u -r1.15 pbx_gtkconsole.c --- pbx/pbx_gtkconsole.c 8 Aug 2004 17:15:02 -0000 1.15 +++ pbx/pbx_gtkconsole.c 21 Apr 2005 05:24:26 -0000 @@ -20,13 +20,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #include #include #include @@ -39,8 +39,8 @@ #include #include /* For where to put dynamic tables */ -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" AST_MUTEX_DEFINE_STATIC(verb_lock); Index: pbx/pbx_kdeconsole_main.cc =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_kdeconsole_main.cc,v retrieving revision 1.3 diff -u -r1.3 pbx_kdeconsole_main.cc --- pbx/pbx_kdeconsole_main.cc 22 Jun 2004 18:49:00 -0000 1.3 +++ pbx/pbx_kdeconsole_main.cc 21 Apr 2005 05:24:26 -0000 @@ -11,10 +11,10 @@ * the GNU General Public License */ -#include -#include -#include -#include +#include "asterisk/module.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" #include "pbx_kdeconsole.h" static char *dtext = "KDE Console Monitor"; Index: pbx/pbx_loopback.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_loopback.c,v retrieving revision 1.4 diff -u -r1.4 pbx_loopback.c --- pbx/pbx_loopback.c 21 Jan 2005 07:06:25 -0000 1.4 +++ pbx/pbx_loopback.c 21 Apr 2005 05:24:26 -0000 @@ -9,25 +9,25 @@ * of the GNU General Public License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" #include #include Index: pbx/pbx_realtime.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_realtime.c,v retrieving revision 1.9 diff -u -r1.9 pbx_realtime.c --- pbx/pbx_realtime.c 25 Jan 2005 06:10:20 -0000 1.9 +++ pbx/pbx_realtime.c 21 Apr 2005 05:24:27 -0000 @@ -9,27 +9,27 @@ * of the GNU General Public License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" #include #include Index: pbx/pbx_spool.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_spool.c,v retrieving revision 1.21 diff -u -r1.21 pbx_spool.c --- pbx/pbx_spool.c 1 Apr 2005 21:31:12 -0000 1.21 +++ pbx/pbx_spool.c 21 Apr 2005 05:24:27 -0000 @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/callerid.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include #include #include @@ -31,7 +31,7 @@ #include #include #include -#include "../astconf.h" +#include "astconf.h" /* * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality... Index: pbx/pbx_wilcalu.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_wilcalu.c,v retrieving revision 1.18 diff -u -r1.18 pbx_wilcalu.c --- pbx/pbx_wilcalu.c 31 Oct 2004 23:17:11 -0000 1.18 +++ pbx/pbx_wilcalu.c 21 Apr 2005 05:24:27 -0000 @@ -17,22 +17,22 @@ * "tech/tele,filename&" ie. "tor1/23,file&" */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include #include #include #include #include #include -#include "../astconf.h" +#include "astconf.h" /* Globals */ Index: res/res_adsi.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_adsi.c,v retrieving revision 1.12 diff -u -r1.12 res_adsi.c --- res/res_adsi.c 6 Apr 2005 05:11:48 -0000 1.12 +++ res/res_adsi.c 21 Apr 2005 05:24:27 -0000 @@ -21,16 +21,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/logger.h" +#include "asterisk/fskmodem.h" +#include "asterisk/channel.h" +#include "asterisk/adsi.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/file.h" #define DEFAULT_ADSI_MAX_RETRIES 3 Index: res/res_agi.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v retrieving revision 1.32 diff -u -r1.32 res_agi.c --- res/res_agi.c 11 Apr 2005 03:23:54 -0000 1.32 +++ res/res_agi.c 21 Apr 2005 05:24:28 -0000 @@ -17,13 +17,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/astdb.h" +#include "asterisk/callerid.h" #include #include #include @@ -34,22 +34,22 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/image.h" +#include "asterisk/say.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/agi.h" +#include "asterisk.h" +#include "astconf.h" #ifdef SOLARIS -#include +#include "asterisk/astmm.h" #endif #define MAX_ARGS 128 Index: res/res_config_odbc.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_config_odbc.c,v retrieving revision 1.24 diff -u -r1.24 res_config_odbc.c --- res/res_config_odbc.c 17 Feb 2005 16:31:08 -0000 1.24 +++ res/res_config_odbc.c 21 Apr 2005 05:24:28 -0000 @@ -9,19 +9,19 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/options.h" #include #include #include -#include -#include +#include "asterisk/res_odbc.h" +#include "asterisk/utils.h" static char *tdesc = "ODBC Configuration"; STANDARD_LOCAL_USER; Index: res/res_crypto.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v retrieving revision 1.19 diff -u -r1.19 res_crypto.c --- res/res_crypto.c 21 Jan 2005 07:06:25 -0000 1.19 +++ res/res_crypto.c 21 Apr 2005 05:24:28 -0000 @@ -12,18 +12,18 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/crypto.h" +#include "asterisk/md5.h" +#include "asterisk/cli.h" +#include "asterisk/io.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include #include #include @@ -32,8 +32,8 @@ #include #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" /* * Asterisk uses RSA keys with SHA-1 message digests for its Index: res/res_features.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_features.c,v retrieving revision 1.47 diff -u -r1.47 res_features.c --- res/res_features.c 20 Apr 2005 16:27:44 -0000 1.47 +++ res/res_features.c 21 Apr 2005 05:24:29 -0000 @@ -11,23 +11,23 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/app.h" +#include "asterisk/say.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/adsi.h" #include #include #include Index: res/res_indications.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_indications.c,v retrieving revision 1.10 diff -u -r1.10 res_indications.c --- res/res_indications.c 25 Jan 2005 06:10:20 -0000 1.10 +++ res/res_indications.c 21 Apr 2005 05:24:29 -0000 @@ -21,16 +21,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/config.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/indications.h" /* Globals */ Index: res/res_monitor.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v retrieving revision 1.31 diff -u -r1.31 res_monitor.c --- res/res_monitor.c 17 Feb 2005 23:08:34 -0000 1.31 +++ res/res_monitor.c 21 Apr 2005 05:24:29 -0000 @@ -6,20 +6,20 @@ #include #include /* dirname() */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" +#include "asterisk/cli.h" +#include "asterisk/monitor.h" +#include "asterisk/app.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk.h" +#include "astconf.h" #define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" Index: res/res_musiconhold.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v retrieving revision 1.57 diff -u -r1.57 res_musiconhold.c --- res/res_musiconhold.c 13 Apr 2005 04:47:39 -0000 1.57 +++ res/res_musiconhold.c 21 Apr 2005 05:24:29 -0000 @@ -11,21 +11,21 @@ * the GNU General Public License */ -#include -#include -#include -#include -#include -#include <../astconf.h> -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "astconf.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/musiconhold.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" #include -#include +#include "asterisk/cli.h" #include #include #include Index: res/res_odbc.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_odbc.c,v retrieving revision 1.13 diff -u -r1.13 res_odbc.c --- res/res_odbc.c 23 Mar 2005 05:56:32 -0000 1.13 +++ res/res_odbc.c 21 Apr 2005 05:24:29 -0000 @@ -9,19 +9,19 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" #include #include #include -#include +#include "asterisk/res_odbc.h" #define MAX_ODBC_HANDLES 25 struct odbc_list Index: res/res_osp.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_osp.c,v retrieving revision 1.12 diff -u -r1.12 res_osp.c --- res/res_osp.c 25 Jan 2005 06:10:20 -0000 1.12 +++ res/res_osp.c 21 Apr 2005 05:24:29 -0000 @@ -13,23 +13,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/file.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/crypto.h" +#include "asterisk/md5.h" +#include "asterisk/cli.h" +#include "asterisk/io.h" +#include "asterisk/lock.h" +#include "asterisk/astosp.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/causes.h" +#include "asterisk/callerid.h" #include #include #include @@ -37,8 +37,8 @@ #include #include #include -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #include #include #include Index: stdtime/localtime.c =================================================================== RCS file: /usr/cvsroot/asterisk/stdtime/localtime.c,v retrieving revision 1.11 diff -u -r1.11 localtime.c --- stdtime/localtime.c 3 Apr 2005 23:23:36 -0000 1.11 +++ stdtime/localtime.c 21 Apr 2005 05:24:30 -0000 @@ -26,8 +26,8 @@ #endif #define TZ_STRLEN_MAX 255 /* #define DEBUG */ -#include -#include +#include "asterisk/lock.h" +#include "asterisk/localtime.h" #ifndef lint Index: utils/astman.c =================================================================== RCS file: /usr/cvsroot/asterisk/utils/astman.c,v retrieving revision 1.12 diff -u -r1.12 astman.c --- utils/astman.c 3 Apr 2005 21:16:01 -0000 1.12 +++ utils/astman.c 21 Apr 2005 05:24:30 -0000 @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "asterisk/md5.h" +#include "asterisk/manager.h" #undef gethostbyname