aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_adsiprog.c22
-rwxr-xr-xapps/app_alarmreceiver.c30
-rwxr-xr-xapps/app_authenticate.c18
-rwxr-xr-xapps/app_cdr.c6
-rwxr-xr-xapps/app_chanisavail.c14
-rwxr-xr-xapps/app_chanspy.c31
-rwxr-xr-xapps/app_controlplayback.c18
-rwxr-xr-xapps/app_curl.c16
-rwxr-xr-xapps/app_cut.c12
-rwxr-xr-xapps/app_datetime.c14
-rwxr-xr-xapps/app_db.c16
-rwxr-xr-xapps/app_dial.c34
-rwxr-xr-xapps/app_directory.c22
-rwxr-xr-xapps/app_disa.c22
-rwxr-xr-xapps/app_dumpchan.c18
-rwxr-xr-xapps/app_echo.c12
-rwxr-xr-xapps/app_enumlookup.c20
-rwxr-xr-xapps/app_eval.c12
-rwxr-xr-xapps/app_exec.c12
-rwxr-xr-xapps/app_festival.c18
-rwxr-xr-xapps/app_flash.c18
-rwxr-xr-xapps/app_forkcdr.c12
-rwxr-xr-xapps/app_getcpeid.c16
-rwxr-xr-xapps/app_groupcount.c18
-rwxr-xr-xapps/app_hasnewvoicemail.c16
-rwxr-xr-xapps/app_ices.c18
-rwxr-xr-xapps/app_image.c16
-rwxr-xr-xapps/app_intercom.c16
-rwxr-xr-xapps/app_ivrdemo.c14
-rwxr-xr-xapps/app_lookupblacklist.c22
-rwxr-xr-xapps/app_lookupcidname.c22
-rwxr-xr-xapps/app_macro.c18
-rwxr-xr-xapps/app_math.c34
-rwxr-xr-xapps/app_md5.c16
-rwxr-xr-xapps/app_meetme.c34
-rwxr-xr-xapps/app_milliwatt.c12
-rwxr-xr-xapps/app_mp3.c16
-rwxr-xr-xapps/app_nbscat.c16
-rwxr-xr-xapps/app_osplookup.c22
-rwxr-xr-xapps/app_parkandannounce.c20
-rwxr-xr-xapps/app_playback.c16
-rwxr-xr-xapps/app_privacy.c26
-rwxr-xr-xapps/app_queue.c38
-rwxr-xr-xapps/app_random.c12
-rwxr-xr-xapps/app_read.c20
-rwxr-xr-xapps/app_readfile.c14
-rwxr-xr-xapps/app_realtime.c18
-rwxr-xr-xapps/app_record.c18
-rwxr-xr-xapps/app_rpt.c26
-rwxr-xr-xapps/app_sayunixtime.c14
-rwxr-xr-xapps/app_senddtmf.c20
-rwxr-xr-xapps/app_sendtext.c16
-rwxr-xr-xapps/app_setcallerid.c18
-rwxr-xr-xapps/app_setcdruserfield.c16
-rwxr-xr-xapps/app_setcidname.c20
-rwxr-xr-xapps/app_setcidnum.c20
-rwxr-xr-xapps/app_setrdnis.c20
-rwxr-xr-xapps/app_settransfercapability.c14
-rwxr-xr-xapps/app_skel.c14
-rwxr-xr-xapps/app_sms.c20
-rwxr-xr-xapps/app_softhangup.c12
-rwxr-xr-xapps/app_sql_postgres.c16
-rwxr-xr-xapps/app_striplsd.c12
-rwxr-xr-xapps/app_substring.c14
-rwxr-xr-xapps/app_system.c14
-rwxr-xr-xapps/app_talkdetect.c18
-rwxr-xr-xapps/app_test.c18
-rwxr-xr-xapps/app_transfer.c12
-rwxr-xr-xapps/app_txtcidname.c20
-rwxr-xr-xapps/app_url.c16
-rwxr-xr-xapps/app_userevent.c14
-rwxr-xr-xapps/app_verbose.c10
-rwxr-xr-xapps/app_voicemail.c38
-rwxr-xr-xapps/app_waitforring.c14
-rwxr-xr-xapps/app_waitforsilence.c14
-rwxr-xr-xapps/app_while.c16
-rwxr-xr-xapps/app_zapateller.c14
-rwxr-xr-xapps/app_zapbarge.c24
-rwxr-xr-xapps/app_zapras.c14
-rwxr-xr-xapps/app_zapscan.c24
80 files changed, 729 insertions, 728 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 2ec1810a7..c6b451a30 100755
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -12,15 +12,15 @@
*/
#include <sys/types.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 <asterisk/utils.h>
-#include <asterisk/lock.h>
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/adsi.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
#include <netinet/in.h>
#include <stdlib.h>
#include <unistd.h>
@@ -30,8 +30,8 @@
#include <stdio.h>
#include <errno.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
static char *tdesc = "Asterisk ADSI Programming Application";
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index bb4ca3e48..59486972f 100755
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -18,21 +18,21 @@
*
*/
-#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 "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 <string.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 8c5d0722e..e64b5147b 100755
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index ce04f72f6..8e6752ac6 100755
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -12,9 +12,9 @@
*/
#include <sys/types.h>
-#include <asterisk/channel.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
+#include "asterisk/channel.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
#include <stdlib.h>
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 23fb373f3..4047f6ba9 100755
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -13,13 +13,13 @@
*
*/
-#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/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 <stdlib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index c12f26246..e90dab41f 100755
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -11,26 +11,27 @@
* the GNU General Public License
*/
-#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor"
-
-#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>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <ctype.h>
+#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);
#define ast_fit_in_short(in) (in < -32768 ? -32768 : in > 32767 ? 32767 : in)
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index af2b79900..bf56dcaa2 100755
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_curl.c b/apps/app_curl.c
index 558117d08..ecc4a2c6b 100755
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -12,14 +12,14 @@
* redistribution.
*/
-#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 "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 <stdlib.h>
#include <string.h>
#include <curl/curl.h>
diff --git a/apps/app_cut.c b/apps/app_cut.c
index 6bcc9be20..6671c4e41 100755
--- a/apps/app_cut.c
+++ b/apps/app_cut.c
@@ -17,12 +17,12 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.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/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
diff --git a/apps/app_datetime.c b/apps/app_datetime.c
index 2f3cc4f20..470a4fbee 100755
--- a/apps/app_datetime.c
+++ b/apps/app_datetime.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_db.c b/apps/app_db.c
index 43c8ec90e..830e38ac0 100755
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -14,14 +14,14 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_dial.c b/apps/app_dial.c
index e69b8f084..95550d77e 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -11,23 +11,23 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <errno.h>
#include <unistd.h>
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 3e4b7d353..5a143c883 100755
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -11,21 +11,21 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
static char *tdesc = "Extension Directory";
static char *app = "Directory";
diff --git a/apps/app_disa.c b/apps/app_disa.c
index e60562c47..0eaf468ec 100755
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -13,17 +13,17 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index c44528ae4..82c573dde 100755
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -11,15 +11,15 @@
* the GNU General Public License (and disclaimed to Digium)
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 09d8a5157..425e0e596 100755
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -11,12 +11,12 @@
* the GNU General Public License
*/
-#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/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c
index 4664cd68a..717e3f3fe 100755
--- a/apps/app_enumlookup.c
+++ b/apps/app_enumlookup.c
@@ -11,16 +11,16 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_eval.c b/apps/app_eval.c
index 333add8a1..527ec516b 100755
--- a/apps/app_eval.c
+++ b/apps/app_eval.c
@@ -17,12 +17,12 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.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/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
diff --git a/apps/app_exec.c b/apps/app_exec.c
index f4e156927..2a6763ba1 100755
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -17,12 +17,12 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.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/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
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 91a23c1fa..fcaa8deb9 100755
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -12,15 +12,15 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_flash.c b/apps/app_flash.c
index a4bf4e84e..9c8e8dbec 100755
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "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 <sys/ioctl.h>
#ifdef __linux__
#include <linux/zaptel.h>
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 87c5ac939..a398333ce 100755
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -9,12 +9,12 @@
* the GNU General Public License
*/
-#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 "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/cdr.h"
+#include "asterisk/module.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index a9846ed1f..2095498e6 100755
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index bd2205ab4..067fae59b 100755
--- a/apps/app_groupcount.c
+++ b/apps/app_groupcount.c
@@ -17,15 +17,15 @@
#include <string.h>
#include <sys/types.h>
#include <regex.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/utils.h>
-#include <asterisk/cli.h>
-#include <asterisk/app.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/utils.h"
+#include "asterisk/cli.h"
+#include "asterisk/app.h"
STANDARD_LOCAL_USER;
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index e008632d9..63102de08 100755
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -32,20 +32,20 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <dirent.h>
-#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";
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 395407dbe..c5ffa45fd 100755
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdio.h>
#include <signal.h>
@@ -27,7 +27,7 @@
#include <fcntl.h>
#include <sys/time.h>
#include <errno.h>
-#include "../astconf.h"
+#include "astconf.h"
#define ICES "/usr/bin/ices"
#define LOCAL_ICES "/usr/local/bin/ices"
diff --git a/apps/app_image.c b/apps/app_image.c
index d859a4aeb..44ed0b85a 100755
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 5c2782433..53a6ec45d 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <unistd.h>
#include <errno.h>
#include <sys/ioctl.h>
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index d182eecf2..420225a32 100755
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index 27db5be34..42bc18e1a 100755
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -11,17 +11,17 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index 89b7664e5..f41411ae0 100755
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -11,17 +11,17 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_macro.c b/apps/app_macro.c
index b0d175d68..f0b37aed3 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -12,15 +12,15 @@
*/
#include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/options.h>
-#include <asterisk/config.h>
-#include <asterisk/utils.h>
-#include <asterisk/lock.h>
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/config.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_math.c b/apps/app_math.c
index d145ea55a..0e0b6304d 100755
--- a/apps/app_math.c
+++ b/apps/app_math.c
@@ -9,20 +9,20 @@
*
*/
-#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 "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 <stdlib.h>
#include <errno.h>
#include <unistd.h>
@@ -34,11 +34,11 @@
#include <sys/types.h>
#include <time.h>
#include <dirent.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
#include <ctype.h>
#include <sys/file.h>
-#include "../astconf.h"
+#include "astconf.h"
static char *tdesc = "Basic Math Functions";
diff --git a/apps/app_md5.c b/apps/app_md5.c
index 1d09be4df..dfc8dd5db 100755
--- a/apps/app_md5.c
+++ b/apps/app_md5.c
@@ -9,14 +9,14 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 25fb1c732..35386f96a 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -11,29 +11,29 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <sys/ioctl.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
#ifdef __linux__
#include <linux/zaptel.h>
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 6b9e6b763..4f729cd9f 100755
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -11,12 +11,12 @@
* the GNU General Public License
*/
-#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/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index b38ec41c2..4a4bcf0b5 100755
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdio.h>
#include <signal.h>
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index f8b4b37b9..13f3e7ae9 100755
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdio.h>
#include <signal.h>
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 1decb7973..0c58dd63a 100755
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -11,17 +11,17 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index ad1ab6dd8..0c8e71945 100755
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -15,16 +15,16 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <unistd.h>
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 7730c93b4..26b204605 100755
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 13bc38c30..7eab0dd39 100755
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -11,19 +11,19 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_queue.c b/apps/app_queue.c
index b352a08f2..0b94257e7 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -39,24 +39,24 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <errno.h>
#include <unistd.h>
@@ -67,7 +67,7 @@
#include <sys/signal.h>
#include <netinet/in.h>
-#include "../astconf.h"
+#include "astconf.h"
#define QUEUE_STRATEGY_RINGALL 0
#define QUEUE_STRATEGY_ROUNDROBIN 1
diff --git a/apps/app_random.c b/apps/app_random.c
index f8558a3b4..d49af9fdd 100755
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -11,12 +11,12 @@
*
*/
-#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/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/apps/app_read.c b/apps/app_read.c
index cb30a7a66..eaff923e9 100755
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -11,16 +11,16 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 3adc79a9c..92815472b 100755
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -16,13 +16,13 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#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>
+#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";
diff --git a/apps/app_realtime.c b/apps/app_realtime.c
index d0895f411..d6450739b 100755
--- a/apps/app_realtime.c
+++ b/apps/app_realtime.c
@@ -12,15 +12,15 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_record.c b/apps/app_record.c
index a06108162..e47c2941a 100755
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 040f8b0ac..b04c8489b 100755
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -120,19 +120,19 @@ enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT};
enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
-#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 "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 <signal.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index a7d09355e..cc2b28c18 100755
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -15,13 +15,13 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.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/say.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/say.h"
static char *tdesc = "Say time";
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index c908ec7e9..d74a8b4ad 100755
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -11,16 +11,16 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 4bacbaa50..391b2b2a2 100755
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 78bd17c43..86cf9bd03 100755
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c
index d0ebd2e13..4684fdd8b 100755
--- a/apps/app_setcdruserfield.c
+++ b/apps/app_setcdruserfield.c
@@ -12,14 +12,14 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <string.h>
diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c
index 44b9dbd04..88e847651 100755
--- a/apps/app_setcidname.c
+++ b/apps/app_setcidname.c
@@ -11,16 +11,16 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c
index bceb67792..e7324da3d 100755
--- a/apps/app_setcidnum.c
+++ b/apps/app_setcidnum.c
@@ -12,16 +12,16 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c
index 3b64c0c85..4c42c9567 100755
--- a/apps/app_setrdnis.c
+++ b/apps/app_setrdnis.c
@@ -12,16 +12,16 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c
index 9685b3964..d998e18bf 100755
--- a/apps/app_settransfercapability.c
+++ b/apps/app_settransfercapability.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/transcap.h"
#include <string.h>
#include <stdlib.h>
-#include <asterisk/transcap.h>
+#include "asterisk/transcap.h"
static char *app = "SetTransferCapability";
diff --git a/apps/app_skel.c b/apps/app_skel.c
index fdfd64949..f1910a573 100755
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_sms.c b/apps/app_sms.c
index dd140f637..401d20fea 100755
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -9,15 +9,15 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include <ctype.h>
-#include "../astconf.h"
+#include "astconf.h"
/* output using Alaw rather than linear */
/*#define OUTALAW */
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 73408958d..6631b0ad7 100755
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -12,12 +12,12 @@
*/
#include <sys/types.h>
-#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/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c
index e83ab2aac..3185dad50 100755
--- a/apps/app_sql_postgres.c
+++ b/apps/app_sql_postgres.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c
index 82d513f85..cc23309ab 100755
--- a/apps/app_striplsd.c
+++ b/apps/app_striplsd.c
@@ -12,12 +12,12 @@
*/
#include <sys/types.h>
-#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/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_substring.c b/apps/app_substring.c
index fb6d81f6c..5f0609ef5 100755
--- a/apps/app_substring.c
+++ b/apps/app_substring.c
@@ -12,13 +12,13 @@
*/
#include <sys/types.h>
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_system.c b/apps/app_system.c
index c08e0ed42..ace307333 100755
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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/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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 681f44223..4d4d2662d 100755
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -11,15 +11,15 @@
* the GNU General Public License
*/
-#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 "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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_test.c b/apps/app_test.c
index 74ca7c5a0..370c547fd 100755
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -14,19 +14,19 @@
#include <sys/types.h>
#include <sys/stat.h>
-#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 "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 <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
-#include "../astconf.h"
+#include "astconf.h"
static char *tdesc = "Interface Test Application";
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 846e4fcbf..f3628959c 100755
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -11,12 +11,12 @@
* the GNU General Public License
*/
-#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/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c
index 5cffb271a..dc39106de 100755
--- a/apps/app_txtcidname.c
+++ b/apps/app_txtcidname.c
@@ -11,16 +11,16 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_url.c b/apps/app_url.c
index e3407c41a..df63a0803 100755
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -11,14 +11,14 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 82de783b3..71890be73 100755
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -8,13 +8,13 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index ba6a908bb..5d767b9b0 100755
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -15,11 +15,11 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <asterisk/options.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
+#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";
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d753097ef..66ed5a3ba 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -14,24 +14,24 @@
* George Konstantoulakis <gkon@inaccessnetworks.com>
*/
-#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>
+#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 <asterisk/res_odbc.h>
+#include "asterisk/res_odbc.h"
#endif
#include <stdlib.h>
#include <errno.h>
@@ -46,8 +46,8 @@
#include <time.h>
#include <dirent.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
#define COMMAND_TIMEOUT 5000
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 3bf8625b5..93dec96d7 100755
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -12,13 +12,13 @@
*/
#include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/options.h>
-#include <asterisk/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 "asterisk/lock.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index c3e6aad18..b1294c179 100755
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -17,13 +17,13 @@
* the GNU General Public License
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_while.c b/apps/app_while.c
index 5822c2ff5..748619ac6 100755
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -12,14 +12,14 @@
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 4972d5396..38ec03fe5 100755
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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/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 <string.h>
#include <stdlib.h>
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index d34cd1946..dc02f8a12 100755
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -14,18 +14,18 @@
* GPL application.
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index d835e12f8..517bbb50e 100755
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -11,13 +11,13 @@
* the GNU General Public License
*/
-#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 "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 <sys/ioctl.h>
#include <sys/wait.h>
#ifdef __linux__
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index bb38d98bb..195fc657c 100755
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -16,18 +16,18 @@
* GPL application.
*/
-#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 "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 <stdlib.h>
#include <unistd.h>
#include <errno.h>