diff --git a/acl.c b/acl.c
index dde791adfdb4085694e172f7977e219d40d1a590..5e697bdf76974da72f7b14a02f346c518cc520ee 100755
--- a/acl.c
+++ b/acl.c
@@ -18,13 +18,13 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
-#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 "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 <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/aesopt.h b/aesopt.h
index 85ad46688bd0364bdb49f08e3afdf7fde96a804f..bb4f05a0b89a0065cd9a803a9d4259a49b21879c 100755
--- a/aesopt.h
+++ b/aesopt.h
@@ -135,8 +135,8 @@
 #ifndef _AESOPT_H
 #define _AESOPT_H
 
-#include <asterisk/aes.h>
-#include <asterisk/endian.h>
+#include "asterisk/aes.h"
+#include "asterisk/endian.h"
 
 /*  CONFIGURATION - USE OF DEFINES
 
diff --git a/alaw.c b/alaw.c
index d0495e5f6cd3325c0fbd702e49b1e46080f0a7cd..548230e8b1be7c98a7f39f02707111302117bf19 100755
--- a/alaw.c
+++ b/alaw.c
@@ -11,7 +11,7 @@
  * the GNU General Public License
  */
 
-#include <asterisk/alaw.h>
+#include "asterisk/alaw.h"
 
 #define AMI_MASK 0x55
 
diff --git a/app.c b/app.c
index b7bacde652ef42c11763e422245f7cfd1a05a09c..6920b967b97c04d80cb888d7d94b0f5468046c67 100755
--- a/app.c
+++ b/app.c
@@ -22,16 +22,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <regex.h>
-#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/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"
 
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 2ec1810a769f23274296e32a901a5847abc3de57..c6b451a30db2def9a7c1889ef27a647ccf49615d 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 bb4ca3e4870c03053260183a3734d12f5930d713..59486972f349f4ab04fa80219f517c65cf3ae3b6 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 8c5d0722ea223ee00674113c4ac0344f8d8c8d31..e64b5147b362cf29b533fe03dcd575693129fa8f 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 ce04f72f62b2f52c69744e5c8a1fe9f35e91d724..8e6752ac6d0ce4f575b26d31ae7e1cfa599b9835 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 23fb373f3580fde1fa267eafddebcf55c42e2213..4047f6ba9b62e2b77e6ef73f31bd349150250316 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 c12f26246b4ce4d6e8839494ccc0b36ece28f4e2..e90dab41f9966166107c5c1584c6f0bd01bb539e 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 af2b79900758303d36d7ebe5f88834ce37a3f66a..bf56dcaa265cfd8d1c848a13d890fee80e778bd7 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 558117d088b3bac74fc64db17aaa738b04a171a5..ecc4a2c6bef4c649aae4de7642ed6cee4b02611f 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 6bcc9be2003d5db7e7cb5746e82d9389f59afea2..6671c4e415be6a6b799e0d969c8f75972ac95c5d 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 2f3cc4f2073a9821377a1948a61a3fc232c58a7b..470a4fbeec2e35f5939edbee603acfb341e9c2b9 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 43c8ec90ed79a502532ee87179e6799df635b152..830e38ac0ed48d4d85c93abfda1ec0f528d4108b 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 e69b8f0849012747bb12a7e9a5830288fa262bc7..95550d77e0f2b881d5fc7e45ab0ec94bf55a42d2 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 3e4b7d3532835b6d63b772b56bb5c6620f310994..5a143c8830f16966b9b3acc0e9e2ce7fb59e3d03 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 e60562c47f3ac882d3ed11e442f01c7261ded6ce..0eaf468ec3217ca5764b7aa28dc789a0777232e7 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 c44528ae4d21d696caa015069e8ec111d2e8e26d..82c573ddefabfc170fdabdc074f5af2245a91971 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 09d8a515743c5b4e4b506a0ef4f0a7351b93498e..425e0e596b297091bdb9ffb6bcfd263f0ee2ff9e 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 4664cd68a3dc0b8be8604dd61a4fa3c813657495..717e3f3fe6e843a459fd7515dee85fdbb841258e 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 333add8a1defff9a4d1090b7fcf5f1ee47cfbdfc..527ec516b7b2b5eaa950cd841fd2a82dee5d4a1e 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 f4e156927a44407eae67ad045621ca8c9d0afa9f..2a6763ba1f18f1064a3bafbf45a5e47778b3b823 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 91a23c1fa6cd1c18b370beebc5ea1ec2fb4c80d5..fcaa8deb917829e8a5ada8714be647291054213d 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 a4bf4e84e997722d3f026527df888f5092fc141f..9c8e8dbec2f7a05a768afed175980f57c39a4a7e 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 87c5ac939ac91d7b26fd52c04154765c74960137..a398333ce65689acb7cdfcab31a4cb75777dd5b6 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 a9846ed1f71b55f6d15d709a853f19bf1a4508aa..2095498e69a1597fc9e40cd66f41a1424e4b3849 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 bd2205ab43be6c66aca07b07bf563335a516ee0d..067fae59b00fef42f2c2b3da7b5d900b65466137 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 e008632d9eccefb2f0edac0220d58066ef133658..63102de0847e5cd6f6e5e8fcdd235ac672ac5e58 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 395407dbeae17933a52c1a68a8f3fac6d797abb5..c5ffa45fd0f5e83518d409dcc2e4218b327981c8 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 d859a4aeb3efa178ee29116dd666313f1d9c541d..44ed0b85a02596679e892d25efd3ef766d85f0e4 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 5c2782433e2ee692fc3efdad9212c627908db534..53a6ec45d2f259710b818034110682ba9cc89316 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 d182eecf239dbc23fa5e09d867ebf7d20f579a1b..420225a32fe7d3382442df16e4a0e3be9365b849 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 27db5be34fc5f9f89c206595fcc4c967e8d53f30..42bc18e1a58469f95940a55c5c890fbe7a4a4c66 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 89b7664e5e08556c59f785f87708c55703446615..f41411ae04ee051477576b1f4951ab333de02516 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 b0d175d68514fb3f6bd32a953292abe9372ccb74..f0b37aed33ac37b7e6dba84018f175db493a3ab7 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 d145ea55a25e349990fce1f956f3c158c9738f84..0e0b6304d20bdfc7cd7f85e7ab3c0526e9bf2f52 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 1d09be4df081fffcc23b0827806b030bf26f0453..dfc8dd5dbb59f3bd0c3bfe1fb15252ab8ff267cc 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 25fb1c7328cf583a63a2fe779d44fb4656984f92..35386f96abbc2e8a2779f3e3fcdb261b434c12e4 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 6b9e6b763f268db1b7194b54cca33aacd3980be5..4f729cd9ff37139743fa794e6deb8a3083b1a38b 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 b38ec41c2fac2ced3a42a6f4b624c03aed45159e..4a4bcf0b5a7195d52f7c2b6f597ea3ce511d281a 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 f8b4b37b92845d5a32b7de8a62ef24fe6bff43a3..13f3e7ae908cb740dabac3b79f3e8f3d40bb09d7 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 1decb7973dfb60e5adf0da1769f5c5e0014e64be..0c58dd63a4fec0bbe33a930b0a402601548149a4 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 ad1ab6dd8eb6b048db99146974f3b4f9cf8cdfa2..0c8e71945ad8285d59665ed761593b1b2301adbf 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 7730c93b415823dd8c7f773906faab9d51f3b924..26b204605dc3bac1b05b22e806d0df8f892e304d 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 13bc38c303582540bd86d7c66cf10763b626d10f..7eab0dd392c40493faeecff810028e660b6be173 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 b352a08f257758af76a768c7e605dc1c7633dae6..0b94257e75075e9b7e6c80fab53127327e191cbb 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 f8558a3b4acfb407f6a785253624b4beba30d764..d49af9fdd9f52d8f2087b96cc58b144dd2a8187f 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 cb30a7a66006c8f4da8112c2b3355ef57ea60a68..eaff923e9a3ce4367bbbdc3bed476537cc09354f 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 3adc79a9ce5d2cc578b27286044e84e3829ba10c..92815472bbe2d5c2e57772c08909914a589b8a72 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 d0895f411aabe910be2c1eca7215010198826759..d6450739b67e72c75359d0a3a3dd76dd3735f664 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 a06108162b73bb119a8fe48622ad2ed4858ee928..e47c2941ac92a0d33b6a92f9588f883e3d529ff8 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 040f8b0ac5df2b9a02f6da51810ef88c508e5dcf..b04c8489babbb48eac9093e965b5f845e3835575 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 a7d09355e19832b4c27eca3b65945964fc358850..cc2b28c18a1258257ffaae7ec8cf93594bf71fec 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 c908ec7e9a5ac3deb4c63247e340286289eee98f..d74a8b4ad002b99fd30a18cabe6847b0b91f0d68 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 4bacbaa5051e0ffd45e7078ca13db0881e291f79..391b2b2a2d1e52fd5ef56778e32a065483831971 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 78bd17c43202f0037baaf6c7aad24671e7082f41..86cf9bd031598f0e08a3a3a86e6186767ce66751 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 d0ebd2e136f277fbaa1ec5e8dc40a264cc0434e0..4684fdd8b63e28473392a0ee86a6385723865ce0 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 44b9dbd0427b4e65212b18fa7345979d09a62fac..88e84765185c36cca29544c73a40474328f9ba2d 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 bceb6779215795a90efccfca71ae25452b731aa4..e7324da3de6796cafef64756dbf10bfc630b44d7 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 3b64c0c85ba2ac8b2035a0e952e5a3312ff99619..4c42c9567ed7e4922b6e9e4851976055d692d533 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 9685b3964c794f79b0afb0d3a5cab48f074ede5a..d998e18bfc41cd90d329b93ff4e23eecc82faf0e 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 fdfd64949aa467d77b8cccd1290da62929060628..f1910a573b9d224c776551af3065ac1b267dcb99 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 dd140f6375682af49a00d994b82723d8d350ed1d..401d20fea36ee7fc349b79dafa82037c39b53d77 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 73408958d93d7926433da0b12dcdfac33f1bbcff..6631b0ad72b9f4132daa759f043eb76b94278492 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 e83ab2aac4b0521aaef15195db0f30df6f0f9267..3185dad50501f5e9c240259ca274f40ff1030b13 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 82d513f8532088658b4b573ee7d109f33e718f34..cc23309ab3a576429326674e4d7ad92f197391db 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 fb6d81f6c6d79ad690461477c15d7783fe9a6b36..5f0609ef550b9f6dc2ed090a6f7e81f04dff3dbb 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 c08e0ed427df1c5eed753c673480749657450297..ace3073330f26e281b6ae82a0f98891245106966 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 681f442238f9c88cb6eedffc87f1f8b624077fd8..4d4d2662d35d0688b2431be6f9cdca01461744d8 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 74ca7c5a0eaf69acf60e7bdc4351fdda4c939f14..370c547fdf78a79dbd32ccbb9812cb6addd0a381 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 846e4fcbf5f4e353bd56ebf3b43f066805e1c21c..f3628959c3828b0b06609f8724a250a5f8200277 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 5cffb271a78ad1a950d289eb3178d83eeb17aacd..dc39106de533c0f31c44abd5b793b138975f5715 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 e3407c41a72852bf3878a4d8f66d83e9ef4b6a3d..df63a0803d0c5e8fa5c81916f3e4795cfeb46d46 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 82de783b324a1c656d998a734896fba1d9387a2c..71890be733f6f8dda361a81465c5dc66ac34fd6c 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 ba6a908bbc104777ada6a0b63bd1f54f555eec07..5d767b9b0b748ab6955230669dab5d96bdd3e103 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 d753097efcccac253dc092d74ede956ca24d2b6a..66ed5a3ba7522050ce11e2a7c7ca50bdf4d9238f 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 3bf8625b5bb243aeed3ba29154c46ed7dd3da95c..93dec96d70e07b37aa135ce6223863b7f644f868 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 c3e6aad1881d34e56fe8ecfda0127d4036a24c1c..b1294c1791932c22c3689561e7e050b2a06da192 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 5822c2ff53d21a3671a6963d57e80987bd31da52..748619ac65a7c231d2b3acf4015cdc51628265a0 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 4972d539619c34a4913da897522ab765308c537d..38ec03fe598f1b21719179321c635029f6c2dc20 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 d34cd194693433f97cd146e45d2c86e440e74295..dc02f8a12f9edfc17d6d5ca1891f570201448fa2 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 d835e12f8de09ff946e063c502a624e833fd7ccd..517bbb50ecf367c481af55b19ca0d8a17a8c3dd9 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 bb38d98bb1103a3d1ae03e5226104327374851d0..195fc657c7aedfadb10d458f2b87bd94b3a97660 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>
diff --git a/ast_expr.y b/ast_expr.y
index 0c8c40a8df78c0e8fa358f81eed22a4acefc0137..de07a0c9d1f33d1f009bd51cdac3f70da8e6c59f 100755
--- a/ast_expr.y
+++ b/ast_expr.y
@@ -21,8 +21,8 @@
 #include <errno.h>
 #include <regex.h>
 #include <limits.h>
-#include <asterisk/ast_expr.h>
-#include <asterisk/logger.h>
+#include "asterisk/ast_expr.h"
+#include "asterisk/logger.h"
 
 #ifndef QUAD_MIN
 #ifdef LONG_LONG_MIN
diff --git a/asterisk.c b/asterisk.c
index 562cf3769d64cd4d1197c6b7dc90933147a585e9..589ec447f15d9968275094f2822941718ba4bea2 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -13,32 +13,32 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#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 "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 <sys/resource.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sched.h>
-#include <asterisk/io.h>
-#include <asterisk/lock.h>
+#include "asterisk/io.h"
+#include "asterisk/lock.h"
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
@@ -47,7 +47,7 @@
 #include <ctype.h>
 #include "editline/histedit.h"
 #include "asterisk.h"
-#include <asterisk/config.h>
+#include "asterisk/config.h"
 #include <sys/resource.h>
 #include <grp.h>
 #include <pwd.h>
diff --git a/astmm.c b/astmm.c
index 4f6c60c7b3c82cfb37afba7a3da491e9870b6052..e2e3fb4de688212ee45827c1051a9042720513ff 100755
--- a/astmm.c
+++ b/astmm.c
@@ -19,10 +19,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <asterisk/cli.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/lock.h>
+#include "asterisk/cli.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/lock.h"
 
 #define SOME_PRIME 563
 
diff --git a/autoservice.c b/autoservice.c
index 772e9dc84073a5d5e10d881030255f49c87c8f69..0d9d1b2f5efd1ca0325821cff4f9c8f1e4c2337b 100755
--- a/autoservice.c
+++ b/autoservice.c
@@ -19,20 +19,20 @@
 #include <errno.h>
 #include <unistd.h>
 #include <math.h>			/* For PI */
-#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>
+#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
 
diff --git a/callerid.c b/callerid.c
index 3a55a73111886e95af532451c39a13b7b2b6dbd9..9e5c78731c52f5322f9eee4d6e36d050de433067 100755
--- a/callerid.c
+++ b/callerid.c
@@ -21,14 +21,14 @@
 #include <unistd.h>
 #include <math.h>
 #include <ctype.h>
-#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>
+#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;
diff --git a/cdr.c b/cdr.c
index 91a11fb0ad695b32e5a39e52c71d25b20db4784d..beffcb3b7b48fa943e6ed54ebacb8bed2407de4a 100755
--- a/cdr.c
+++ b/cdr.c
@@ -14,14 +14,14 @@
  *
  */
 
-#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 "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 <unistd.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 150733a2b8b4093b54e9389f555f6156e15b043c..ca5b96370b16771a699db3611a5adea805f7e6bb 100755
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -15,13 +15,13 @@
  */
 
 #include <sys/types.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"
+#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"
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index bfde470e2c120f46d1e13a0ed2ccd4a97f44fa2e..69b6f2c51b3f7ead891f62075eb56dd6cf44876f 100755
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -15,15 +15,15 @@
  */
 
 #include <sys/types.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"
+#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"
 
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 110aebadc74585ef41d34bace928774f79c1b727..6ba46fd5f14247d46ff37e1d6be2c0e392be8f88 100755
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -9,15 +9,15 @@
  */
 
 #include <sys/types.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 "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 <strings.h>
 #include <unistd.h>
 #include <time.h>
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 7aefd93895707b44b1fd0ad9359177b50554b77c..c31fb63f3aa28947552753dfc2a094c80a31a2b4 100755
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -12,13 +12,13 @@
  */
 
 #include <sys/types.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 "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 <stdio.h>
 #include <string.h>
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 44e6d25fb77a99922d23ebf66210774692a56f90..5aa2430a2f22c3fff17bdffcb738d3d038191bdf 100755
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -15,13 +15,13 @@
  */
 
 #include <sys/types.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 "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 <stdio.h>
 #include <string.h>
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 6db044bb50193aab0f1dbbfcd36f1fb70e534763..ec6018cb16835603307ea131a4ab7c0546d9c1e6 100755
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -14,12 +14,12 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/channel.h>
-#include <asterisk/module.h>
-#include <asterisk/logger.h>
-#include <asterisk/utils.h>
-#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 <unistd.h>
 #include <string.h>
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 69866a3ae78ecdd8ecbb88b01205c224b85d6564..5e99529f6c20c948184af5bcdb35fecd6784bc4b 100755
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -35,13 +35,13 @@ CREATE TABLE [dbo].[cdr] (
 */
 
 #include <sys/types.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 "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 <stdio.h>
 #include <string.h>
diff --git a/channel.c b/channel.c
index cfbbb99815e599c2dc6018df2657a13235b56ce0..d08bc42f6f67ef67de619a598b59dc27c536050a 100755
--- a/channel.c
+++ b/channel.c
@@ -19,27 +19,27 @@
 #include <errno.h>
 #include <unistd.h>
 #include <math.h>			/* For PI */
-#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>
+#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 <sys/ioctl.h>
 #ifdef __linux__
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index ac8be55cdbad7cd88469d74cde5916a9bfbe2200..46427e2cb5b20ed2acb9a31ebfd3a86eb43c02a8 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -13,28 +13,28 @@
 
 #include <stdio.h>
 #include <string.h>
-#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 "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 <sys/socket.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index cde0e9e2df8f927dad3d420c5327b250ad5ba740..215a55ef09b40315e4225a0b8e9753d732550d79 100755
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -9,17 +9,17 @@
  * the GNU General Public License
  */
 
-#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 "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 <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 9ddfc54167abce114c3717f3ac69c26c3996f3fb..8db531d3ca2d44f96ede3333dcd4d250d42a0423 100755
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -13,24 +13,24 @@
 
 #include <stdio.h>
 #include <string.h>
-#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/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 <sys/socket.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 9b83f779f38b5dc38ff725eacde85dcde2bc3b18..351237b70067a5ff8311a7794bf93b2e4c8cf9a2 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -49,23 +49,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif   
-#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>
+#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
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 928ec8aa6197ac2620bf708084df6741c6293fb5..b4b14c8b00f08791a6f855102ae3cfd95757e404 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11,33 +11,33 @@
  * the GNU General Public License
  */
 
-#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 "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 <sys/mman.h>
 #include <arpa/inet.h>
 #include <dirent.h>
@@ -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 */
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 05a20992e4ca0e8114333f4d1f5ec7854a880706..bc177f676080aa223fd12cf7fb6a815db0c42034 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -13,24 +13,24 @@
 
 #include <stdio.h>
 #include <string.h>
-#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/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 <sys/socket.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 82ed6edf568d800444fa7e293894e60315939117..78f7d374933377cb6abc57ea084c72676e0a4eb8 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -55,28 +55,28 @@
 
 #include <stdio.h>
 #include <string.h>
-#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 "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 <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
@@ -91,7 +91,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <asterisk/dsp.h>
+#include "asterisk/dsp.h"
 #include <ctype.h>
 
 #ifndef IPTOS_MINCOST
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index 64c73aa38d64a5147904693a319b6e525f775d2c..ad80e3e4898452373ae874739ade4c577f387328 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -13,15 +13,15 @@
 
 #include <stdio.h>
 #include <string.h>
-#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 "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 <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/channels/chan_modem_aopen.c b/channels/chan_modem_aopen.c
index 4d18137f05f995349ea81548fa05851c48507a4c..c14a8f6d4986c29727cd68b93e8de4cd01d4cb16 100755
--- a/channels/chan_modem_aopen.c
+++ b/channels/chan_modem_aopen.c
@@ -16,12 +16,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#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/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
diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c
index ec24369dc60d06e9d416c30bfd8fdf3f5c0b0848..aff1d5df981a8e2778a271d2a578055a8f666ecd 100755
--- a/channels/chan_modem_bestdata.c
+++ b/channels/chan_modem_bestdata.c
@@ -18,12 +18,12 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
-#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/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
diff --git a/channels/chan_modem_i4l.c b/channels/chan_modem_i4l.c
index bb032e2b52694081c5e9ce5f4d69623572a97023..130ecdb81e5d8b3e08fb351e99c37a6a46329090 100755
--- a/channels/chan_modem_i4l.c
+++ b/channels/chan_modem_i4l.c
@@ -18,16 +18,16 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#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>
+#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
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 184b694dd1302312443da5779d40b15d64c6e8bb..fb5809cc00e17668c6adb1192d2d214215563b58 100755
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -13,13 +13,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#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/channel.h"
+#include "asterisk/config.h"
+#include "asterisk/logger.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+#include "asterisk/options.h"
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 6a580d48c4c01fc9f3a0615da45fec84f63baa44..809fdba08ebee6715ef8420f73174eaceccab433 100755
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -15,18 +15,18 @@
  * the GNU General Public License
  */
 
-#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 "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 <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 7208ea09e7a5d69dd13fe248901c800d1c478ee1..20290aba00a5de10b58d4fe837c91783fb0a7a14 100755
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -14,16 +14,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#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 "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 <sys/socket.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4c33cc4085aa935b24123efd03149e0b4a0643db..0df1dc7d51a425544bcdabe1d7dfd1ab409187d3 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15,35 +15,35 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#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>
+#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 <asterisk/astosp.h>
+#include "asterisk/astosp.h"
 #endif
 #include <sys/socket.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 677157abf2271e341166d304b51ec6db71fe2837..bbb336c4750de65d15b975b1580596b0d1e0d918 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -16,27 +16,27 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#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/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 <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -49,7 +49,7 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <asterisk/dsp.h>
+#include "asterisk/dsp.h"
 #include <ctype.h>
 
 /************************************************************************************/
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 7b47772a57e8041135626c80e1d5fed82f9beabc..af1199c3bbb89a2554f22513c6e67cd118dfea12 100755
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -22,17 +22,17 @@ extern "C" {
 
 #include <stdio.h>
 #include <string.h>
-#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>
+#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"
 
 }
 
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2e18dcbd87550e5da6c74a32f510a6554e3f8428..7b41aa2bfec11dc65306c627631ca0ab3fdf502d 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -13,32 +13,32 @@
 
 #include <stdio.h>
 #include <string.h>
-#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 "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 <sys/signal.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -65,7 +65,7 @@
 #include <libmfcr2.h>
 #endif
 
-#include "../asterisk.h"
+#include "asterisk.h"
 
 #ifndef ZT_SIG_EM_E1
 #error "Your zaptel is too old.  please cvs update"
diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index a21fc5b54773c5144642c039e429f33a21bac03c..cf1c33c3126a13c679e9cf705bdd36105e737c8c 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -40,7 +40,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif   
-#include <asterisk/logger.h>
+#include "asterisk/logger.h"
 #ifdef __cplusplus
 }
 #endif
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 61038c338c947b067c551a2a593afd3717a87130..34b5ae92797d635909077ae9f275b3b225836772 100755
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -15,9 +15,9 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <asterisk/frame.h>
-#include <asterisk/utils.h>
-#include <asterisk/unaligned.h>
+#include "asterisk/frame.h"
+#include "asterisk/utils.h"
+#include "asterisk/unaligned.h"
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index dc31e33c8d2238e8aa71f0f3f9881007d1deba6a..5feec89a7a38dc579d8da5130320f635100728ef 100755
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -12,19 +12,19 @@
  *
  */
 
-#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 "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 <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/socket.h>
-#include <asterisk/utils.h>
+#include "asterisk/utils.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chanvars.c b/chanvars.c
index 2f23c4dd11898d0e402cf3f82d5cb55179d6994c..3d768b213f9ab4fe940e4e3fe413eabb10362b98 100755
--- a/chanvars.c
+++ b/chanvars.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <asterisk/chanvars.h>
-#include <asterisk/logger.h>
+#include "asterisk/chanvars.h"
+#include "asterisk/logger.h"
 
 struct ast_var_t *ast_var_assign(const char *name, const char *value)
 {
diff --git a/cli.c b/cli.c
index 2ee83ab63e203850f4caed36951b1f190a890e8b..e11e0fa599b511828161c0b31d8331b0560157e2 100755
--- a/cli.c
+++ b/cli.c
@@ -13,15 +13,15 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#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 "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 <sys/signal.h>
 #include <stdio.h>
 #include <signal.h>
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 09b8e02bc05f004ff36d597942ab58521b05d237..772d8eb62b0bb90dc04847ebf8d4fc0449ca4256 100755
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -10,13 +10,13 @@
  * the GNU General Public License
  */
 
-#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 "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 <fcntl.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 027c649269d9b70527af6ec0159d3e0ebb5bb654..8511e7cf40bd034d7a8c05ba48a501d2fe8f3cfa 100755
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -14,13 +14,13 @@
  * the GNU General Public License
  */
 
-#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/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 <fcntl.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 1563db3ccad25dab7a05513a321959ac92924b07..0c99c563857cff94b5e86f9ea2caaddfac522854 100755
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -10,14 +10,14 @@
  * the GNU General Public License
  */
 
-#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 "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 <fcntl.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
index 48b85e8ddb10462c0edcf336d914cd3159153476..862443900a6523e22bbc7d74e3f92d2fff02c40f 100755
--- a/codecs/codec_g723_1.c
+++ b/codecs/codec_g723_1.c
@@ -22,11 +22,11 @@
 #define TYPE_MASK	 0x3
 
 #include <sys/types.h>
-#include <asterisk/lock.h>
-#include <asterisk/translate.h>
-#include <asterisk/module.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
+#include "asterisk/lock.h"
+#include "asterisk/translate.h"
+#include "asterisk/module.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index f05ba7694e5892a5a4858509e03e586213c0184f..7ba76a98fbe028560f89d7991f8345f215451af5 100755
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -13,13 +13,13 @@
  * the GNU General Public License
  */
 
-#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/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 <fcntl.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index bc476a8537b6d09513b1feff436ff77949adf42c..d562c6b5f089d544bec690610971d77146f8900b 100755
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -14,13 +14,13 @@
  * the GNU General Public License
  */
 
-#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 "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 <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 1c7428e8ff5790c64ceeffeb88269e5216f3896f..503e3c784b2c4a407784763f9ece779b3ce7bbf2 100755
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -13,11 +13,11 @@
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/translate.h>
-#include <asterisk/module.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
+#include "asterisk/lock.h"
+#include "asterisk/translate.h"
+#include "asterisk/module.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 80821d09e4aa36e09c7233aa4f3064a737059a8f..1e7654863b64678563216919fecfa492074444ac 100755
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -17,13 +17,13 @@
  */
 
 
-#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 "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 <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index d59a849b4e0f7adb2f2c9659bee268097f52d4cd..d783771b0c26891f2115f45b0771b10e7963b032 100755
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -28,13 +28,13 @@ static int dtx = 0;
 #define TYPE_LOW	 0x1
 #define TYPE_MASK	 0x3
 
-#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 "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 <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 9dd0e47907aae5fbf1b77200c9f149158b9333a8..22084822cab32a8880da5e595eb48e61e02df7b9 100755
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -10,14 +10,14 @@
  * the GNU General Public License
  */
 
-#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 "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 <fcntl.h>
 #include <netinet/in.h>
 #include <stdio.h>
diff --git a/config.c b/config.c
index afe7211f7b00e9ced561d3da382fd07ea5290f69..a4673cbacf5b8c873d9d39638302e2e9224274b9 100755
--- a/config.c
+++ b/config.c
@@ -24,14 +24,14 @@
 #endif
 # include <glob.h>
 #endif
-#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/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"
 
diff --git a/config_old.c b/config_old.c
index 9b922025ce1b00e3d92720957b13d0ff58150009..c2d8cdf3bac5f482ab735fd577c0ddc05490ef1f 100755
--- a/config_old.c
+++ b/config_old.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <asterisk/config.h>
-#include <asterisk/logger.h>
+#include "asterisk/config.h"
+#include "asterisk/logger.h"
 
 struct ast_config *ast_load(char *configfile)
 {
diff --git a/db.c b/db.c
index 9d127ddaf1aad272fbba862621be7a4df3744697..aa3fd045ff7f65ff5a9075e743fb3a2a67187a92 100755
--- a/db.c
+++ b/db.c
@@ -23,17 +23,17 @@
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
-#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 "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"
diff --git a/dlfcn.c b/dlfcn.c
index 6ef390c4a0681282e0e097abe84d8253758dd0a9..0fae63514b08fc39941af12f5e7a7f4f6acd0109 100755
--- a/dlfcn.c
+++ b/dlfcn.c
@@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __BSD_VISIBLE
 #define __BSD_VISIBLE 1
 #endif
-#include <asterisk/dlfcn-compat.h>
+#include "asterisk/dlfcn-compat.h"
 
 #ifndef dl_restrict
 #define dl_restrict __restrict
diff --git a/dns.c b/dns.c
index 807d2c279ae1908bf264a5843170b54933d709e8..7fe8a2513c79eeb562b87c309142e3d5dc57ed9a 100755
--- a/dns.c
+++ b/dns.c
@@ -16,10 +16,10 @@
 #include <resolv.h>
 #include <unistd.h>
 
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/dns.h>
-#include <asterisk/endian.h>
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/dns.h"
+#include "asterisk/endian.h"
 
 #define MAX_SIZE 4096
 
diff --git a/dnsmgr.c b/dnsmgr.c
index d662ba2ed2fc43db8461e1ccfba98201bd06da45..c954b41883de7856abc5f27f0c53b99a0bf15767 100755
--- a/dnsmgr.c
+++ b/dnsmgr.c
@@ -23,14 +23,14 @@
 #include <regex.h>
 #include <signal.h>
 
-#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/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;
diff --git a/dsp.c b/dsp.c
index 3f12b7ca24fcbc6e57a8a188bffe3938d5727610..0395865ba7397ac7b1bc92cade774ee4e1116716 100755
--- a/dsp.c
+++ b/dsp.c
@@ -29,12 +29,12 @@
 */
 
 #include <sys/types.h>
-#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 "asterisk/frame.h"
+#include "asterisk/channel.h"
+#include "asterisk/logger.h"
+#include "asterisk/dsp.h"
+#include "asterisk/ulaw.h"
+#include "asterisk/alaw.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/enum.c b/enum.c
index 6778124d857a6474a0c6ce9e238b7c0bf91f997b..a17281c16e4aba244bbc36239c2a7be54e592658 100755
--- a/enum.c
+++ b/enum.c
@@ -26,13 +26,13 @@
 #include <unistd.h>
 #include <errno.h>
 
-#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>
+#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
diff --git a/file.c b/file.c
index a37b5c507bd810c240d8560126fdf13b632158ef..6b85b99cd6139b7548cafc13a09edcbf509f7f1c 100755
--- a/file.c
+++ b/file.c
@@ -12,17 +12,17 @@
  */
 
 #include <sys/types.h>
-#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 "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 <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 0b061c20f5052bcc2dcf4e6d8a200e08a98c9805..25e1899fe8442cd08fd31b9b3116eceafac20d37 100755
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -11,12 +11,12 @@
  * the GNU General Public License
  */
  
-#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/lock.h"
+#include "asterisk/channel.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/sched.h"
+#include "asterisk/module.h"
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 0371a75589524229fa83665d633e838247107261..67ecaae9e25561d2c0c2ca6e83efcb92e782ed5d 100755
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -9,14 +9,14 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 46fd0953fbb62a563fef1b74dbb7244aba3c9a73..597fb78e613bb934fbbf44b937ef2207e0dd5fae 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index c4a63aa68395938ecf9b65c7c8f5176121543f12..7011e5da6e369e99408ec934ffa317080e1ff30a 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_h263.c b/formats/format_h263.c
index a676cf8fbf101caf7c5eab5ad5b2168bc670e2af..c5bfd243eb50b06b9fb8119ebe9a97609b156e91 100755
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index c340994612c3f05c9805ca40c53529827f33b3a1..19ea3de21f5f26ec2f2796d7e8882c361270fdea 100755
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -13,13 +13,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index d750e567ee8f925d6346aeee2de13d8de1a11ad7..0e81d890fec592199f603d47263cf6186a7e062e 100755
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -12,14 +12,14 @@
  */
  
 #include <sys/types.h>
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 79f5f226aae7b833926c6ecc675fdd5ceaa6dcbb..6a0552fe59fc46b0f938224bb22c728c3347c314 100755
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index b5f27be39db5738f6958ab06248dfa16928ebc81..9b1e5efaed356442bb49e84a94e0894344546106 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 4c0b1bc523b19cf1138faf84d11aa360f6ba8931..d5c562a01e94c222616e789c51c207d5ae705a70 100755
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -9,13 +9,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 3413a4aa22f8d46f04c8b2465445847fc2d8c83e..8753c3bdd9965cff95dd55ded474eaa3bab8d6b7 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 66b82d468aebd7471acefd8cdacaf5acc86fb093..2282aac122acbc8fd141f2c3a5973a9e56989332 100755
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index fcd4c2ac2172c9022f1c710efa8589ee79550804..7d8717faaff32fdf2b0719cc1ead48b3b71733f8 100755
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -11,13 +11,13 @@
  * the GNU General Public License
  */
  
-#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 "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 <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/frame.c b/frame.c
index 8be142cbbe6fe04add7908acae9ea89fee91a1f2..75179c1a9d522f16183c108021c2b693343f94b4 100755
--- a/frame.c
+++ b/frame.c
@@ -11,14 +11,14 @@
  * the GNU General Public License
  */
 
-#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 "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 <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/fskmodem.c b/fskmodem.c
index f89e40a844cf1f6192e3db541055b4672b087b69..76cc7b14129d5491495b48f89dd3504483b2b874 100755
--- a/fskmodem.c
+++ b/fskmodem.c
@@ -14,7 +14,7 @@
  *
  */
 
-#include <asterisk/fskmodem.h>
+#include "asterisk/fskmodem.h"
 
 #include <stdio.h>
 
diff --git a/image.c b/image.c
index 3ffc852ee4e6f3b68be187f2803d997b733a408a..a169f74d81031b276be49e70c713794f2721419d 100755
--- a/image.c
+++ b/image.c
@@ -19,15 +19,15 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
-#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/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"
 
diff --git a/astconf.h b/include/astconf.h
similarity index 100%
rename from astconf.h
rename to include/astconf.h
diff --git a/asterisk.h b/include/asterisk.h
similarity index 100%
rename from asterisk.h
rename to include/asterisk.h
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index 6454b1e3e0911c6bfc908ba6b6fe97658ea75b57..100d45ad32054de481ac1e92c24519f4ca2455a2 100755
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif
 
 #include <netinet/in.h>
-#include <asterisk/io.h>
-#include <asterisk/astobj.h>
+#include "asterisk/io.h"
+#include "asterisk/astobj.h"
 
 #define AST_SENSE_DENY                  0
 #define AST_SENSE_ALLOW                 1
diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h
index 085021006a7265c956313af075c0c2086ce053b7..26c2795b39e44bf23829366f7652acea06e45f25 100755
--- a/include/asterisk/adsi.h
+++ b/include/asterisk/adsi.h
@@ -16,7 +16,7 @@
 
 #ifndef _ADSI_H
 #define _ADSI_H
-#include <asterisk/callerid.h>
+#include "asterisk/callerid.h"
 
 /* ADSI Message types */
 #define ADSI_MSG_DISPLAY	132
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index efb29562ddc78bedd43202bf3432aaae95cbf0ec..a4fa3e77a754b6974e89c4890f77d012c988d871 100755
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -15,7 +15,7 @@
 #define _ASTERISK_ASTOBJ_H
 
 #include <string.h>
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 
 /*!
   \file astobj.h
diff --git a/include/asterisk/astosp.h b/include/asterisk/astosp.h
index 4a5b59c2e946e9e13c78f769fec9ea2a5872274e..977933f4ea02c486b3fefbb30d8aef6613a7ed9a 100755
--- a/include/asterisk/astosp.h
+++ b/include/asterisk/astosp.h
@@ -13,7 +13,7 @@
 
 #ifndef _ASTERISK_OSP_H
 #define _ASTERISK_OSP_H
-#include <asterisk/channel.h>
+#include "asterisk/channel.h"
 #include <netinet/in.h>
 #include <time.h>
 
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index 7ff6a428104293492ee686938c4afdcb9d9acf09..570bd7569f14a5e272847edb426977e0140ec88d 100755
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -17,7 +17,7 @@
 #ifndef _CDR_H
 #define _CDR_H
 
-#include <asterisk/channel.h>
+#include "asterisk/channel.h"
 #include <sys/time.h>
 #define AST_CDR_FLAG_KEEP_VARS		(1 << 0)
 #define AST_CDR_FLAG_POSTED			(1 << 1)
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 4d121bb69e49afa274bebda02456a809bc0e6ac6..122f46416cff6b3429e4f0ba57ac0b7becf64db3 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -17,14 +17,14 @@
 #ifdef SOLARIS
 #include <solaris-compat/compat.h>
 #endif
-#include <asterisk/frame.h>
-#include <asterisk/sched.h>
-#include <asterisk/chanvars.h>
+#include "asterisk/frame.h"
+#include "asterisk/sched.h"
+#include "asterisk/chanvars.h"
 
 #include <unistd.h>
 #include <setjmp.h>
 #if defined(__APPLE__)
-#include <asterisk/poll-compat.h>
+#include "asterisk/poll-compat.h"
 #else
 #include <sys/poll.h>
 #endif
@@ -33,14 +33,14 @@
 extern "C" {
 #endif
 
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 
 /*! Max length of an extension */
 #define AST_MAX_EXTENSION 80
 
-#include <asterisk/cdr.h>
-#include <asterisk/monitor.h>
-#include <asterisk/utils.h>
+#include "asterisk/cdr.h"
+#include "asterisk/monitor.h"
+#include "asterisk/utils.h"
 
 
 #define AST_CHANNEL_NAME 80
diff --git a/include/asterisk/chanvars.h b/include/asterisk/chanvars.h
index f6b4f813dbd65a0fba40bab9888f942e8f2db2c3..b03824c4efb31dc085d466c33fb5943425993c3c 100755
--- a/include/asterisk/chanvars.h
+++ b/include/asterisk/chanvars.h
@@ -14,7 +14,7 @@
 #ifndef _ASTERISK_CHANVARS_INCLUDE
 #define _ASTERISK_CHANVARS_INCLUDE
 
-#include <asterisk/linkedlists.h>
+#include "asterisk/linkedlists.h"
 
 struct ast_var_t {
 	AST_LIST_ENTRY(ast_var_t) entries;
diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index d7d9602b6edcf612b7a5c55b06aa1eb3411ac980..17fe05ec4b863cf6a268cbbae2fd2efaf31b94ed 100755
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -36,7 +36,7 @@ struct ast_variable {
 	char stuff[0];
 };
 
-#include <asterisk/config_old.h>
+#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);
diff --git a/include/asterisk/crypto.h b/include/asterisk/crypto.h
index 13bf0c3734db44b751aef9af6791b79d325374dc..a869de80aa3b2385c5556b47b86836d34990871c 100755
--- a/include/asterisk/crypto.h
+++ b/include/asterisk/crypto.h
@@ -14,8 +14,8 @@
 #ifndef _ASTERISK_CRYPTO_H
 #define _ASTERISK_CRYPTO_H
 
-#include <asterisk/channel.h>
-#include <asterisk/file.h>
+#include "asterisk/channel.h"
+#include "asterisk/file.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/include/asterisk/cvsid.h b/include/asterisk/cvsid.h
index ce6b84aed66cffc0e3f66160f73138937e272a96..4ac5b2a08ea6e1b20241a30d1f90d29899675978 100755
--- a/include/asterisk/cvsid.h
+++ b/include/asterisk/cvsid.h
@@ -35,7 +35,7 @@
 /*
  * To use this macro, in the source file put the lines:
  *
- * #include <asterisk/cvsid.h>
+ * #include "asterisk/cvsid.h"
  * #ifndef lint
  * CVSID("$Id$");
  * #endif
diff --git a/include/asterisk/dundi.h b/include/asterisk/dundi.h
index e7820691ff7c88129669157c6075b2dd8965d9cb..080b9da75c49560d3c45cda97b41336a43ee2c82 100755
--- a/include/asterisk/dundi.h
+++ b/include/asterisk/dundi.h
@@ -11,7 +11,7 @@
 #ifndef _ASTERISK_DUNDI_H 
 #define _ASTERISK_DUNDI_H
 
-#include <asterisk/channel.h>
+#include "asterisk/channel.h"
 
 #define DUNDI_PORT 4520
 
diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h
index d2d8a134b909bf0bca90b9a92dcdd6c5a0ac95cd..15c059836f5709fc63526de76287717566bb4065 100755
--- a/include/asterisk/enum.h
+++ b/include/asterisk/enum.h
@@ -17,7 +17,7 @@
 
 #ifndef _ASTERISK_ENUM_H
 #define _ASTERISK_ENUM_H
-#include <asterisk/channel.h>
+#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 
diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 30600bab5f5c560b102d2704d66a2fc5a277f94a..3ca59e6253643b791fec477062659d2c6e2a857f 100755
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -14,8 +14,8 @@
 #ifndef _ASTERISK_FILE_H
 #define _ASTERISK_FILE_H
 
-#include <asterisk/channel.h>
-#include <asterisk/frame.h>
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
 #include <fcntl.h>
 
 
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index a90d2bbb612f5fa7f5e6097115fb8ba89a2d8346..5ca3376ce3003fa146eac698762341caa837f01e 100755
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -22,7 +22,7 @@ extern "C" {
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <asterisk/endian.h>
+#include "asterisk/endian.h"
 
 struct ast_codec_pref {
 	char order[32];
diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h
index 9b8ebca5c9e9fdbb36d2d9e50aae754da427f088..2aec759d2af209a8cb58f46c2a0c7a64d5449200 100755
--- a/include/asterisk/indications.h
+++ b/include/asterisk/indications.h
@@ -22,7 +22,7 @@
 #ifndef _ASTERISK_INDICATIONS_H
 #define _ASTERISK_INDICATIONS_H
 
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 
 /* forward reference */
 struct ast_channel;
diff --git a/include/asterisk/io.h b/include/asterisk/io.h
index f841c3c06503a71cb696b97af9f91d4c9975695a..2973c5c69c090e7d0a45ed8bd1964b4be218eaf7 100755
--- a/include/asterisk/io.h
+++ b/include/asterisk/io.h
@@ -15,7 +15,7 @@
 #define _IO_H
 
 #ifdef __APPLE__
-#include <asterisk/poll-compat.h>
+#include "asterisk/poll-compat.h"
 #else
 #include <sys/poll.h>		/* For POLL* constants */
 #endif
diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index edf3e164e573780257c35b4ba7ac722b37c70b72..75623561b0c800413146b31a30b725c898954ee9 100755
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -1,7 +1,7 @@
 #ifndef ASTERISK_LINKEDLISTS_H
 #define ASTERISK_LINKEDLISTS_H
 
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 
 /*!
   \file linkedlists.h
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 2c33d54f007493ea909843e67ed6d51c8a2250e7..62454255d8842904ec488a88db2ce17b360ead2b 100755
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -23,7 +23,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 
 /*!
   \file manager.h
diff --git a/include/asterisk/monitor.h b/include/asterisk/monitor.h
index 3561197d4a3eaa3d5f0adf6f6d83f0dac6ef16ab..62439cad01459c4e114bba4c0bae5c9d80ab3111 100755
--- a/include/asterisk/monitor.h
+++ b/include/asterisk/monitor.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-#include <asterisk/channel.h>
+#include "asterisk/channel.h"
 
 struct ast_channel;
 
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 265993d7df2647b53b84248458eeabf1087c5157..4c96776394153d2dc07fbd4fc14b7c42681efefe 100755
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -13,8 +13,8 @@
 #ifndef _ASTERISK_PBX_H
 #define _ASTERISK_PBX_H
 
-#include <asterisk/sched.h>
-#include <asterisk/channel.h>
+#include "asterisk/sched.h"
+#include "asterisk/channel.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h
index c2a6d5472ef0ade4f639eacf2356516533cd7d62..4053cd0b59f13c70ebef135e7c8e9585238eb04f 100755
--- a/include/asterisk/rtp.h
+++ b/include/asterisk/rtp.h
@@ -14,10 +14,10 @@
 #ifndef _ASTERISK_RTP_H
 #define _ASTERISK_RTP_H
 
-#include <asterisk/frame.h>
-#include <asterisk/io.h>
-#include <asterisk/sched.h>
-#include <asterisk/channel.h>
+#include "asterisk/frame.h"
+#include "asterisk/io.h"
+#include "asterisk/sched.h"
+#include "asterisk/channel.h"
 
 #include <netinet/in.h>
 
diff --git a/include/asterisk/say.h b/include/asterisk/say.h
index 52197d4eaeaa8ebd48cb4892556afa0616d0db98..436281c5db2949c67fc589b222739a07b1714546 100755
--- a/include/asterisk/say.h
+++ b/include/asterisk/say.h
@@ -14,8 +14,8 @@
 #ifndef _ASTERISK_SAY_H
 #define _ASTERISK_SAY_H
 
-#include <asterisk/channel.h>
-#include <asterisk/file.h>
+#include "asterisk/channel.h"
+#include "asterisk/file.h"
 
 #include <time.h>
 
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index b33cec629537e2dd213d85fe4c9b18b72dc8ab9e..507682ab5249eb5972a55a9629d358cfd2e3849d 100755
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -20,8 +20,8 @@
 extern "C" {
 #endif
 
-#include <asterisk/frame.h>
-#include <asterisk/plc.h>
+#include "asterisk/frame.h"
+#include "asterisk/plc.h"
 
 /* Declared by individual translators */
 struct ast_translator_pvt;
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index b1b71d73e0f4765d076d9b01413dc828af5f7dd5..226e230cee89e803f51dbad6abaf13c8096c28f2 100755
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -18,7 +18,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <pthread.h>
-#include <asterisk/lock.h>
+#include "asterisk/lock.h"
 #include <limits.h>
 
 /* Note:
diff --git a/include/asterisk/vmodem.h b/include/asterisk/vmodem.h
index e45b981cdcba1b2d50fe92fec5def33d80013b20..1711f4c181847637063831cf6aec239216cd61cf 100755
--- a/include/asterisk/vmodem.h
+++ b/include/asterisk/vmodem.h
@@ -14,8 +14,8 @@
 #ifndef _ASTERISK_VMODEM_H
 #define _ASTERISK_VMODEM_H
 
-#include <asterisk/frame.h>
-#include <asterisk/channel.h>
+#include "asterisk/frame.h"
+#include "asterisk/channel.h"
 
 #define CHAR_DLE		0x10
 #define CHAR_ETX		0x03
diff --git a/indications.c b/indications.c
index 51e5f209b51638bef7d555fc427ee39e7af18a6f..0f93e458c1dd0fca45c95865b071f84d32f9a90e 100755
--- a/indications.c
+++ b/indications.c
@@ -20,13 +20,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>			/* For PI */
-#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>
+#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;
diff --git a/io.c b/io.c
index d1d8edb132a0a42efc20ba79f37b331e4a4d73a8..8b915d2299921b252dc8824a68674e929fc265e0 100755
--- a/io.c
+++ b/io.c
@@ -17,8 +17,8 @@
 #include <termios.h>
 #include <string.h> /* for memset */
 #include <sys/ioctl.h>
-#include <asterisk/io.h>
-#include <asterisk/logger.h>
+#include "asterisk/io.h"
+#include "asterisk/logger.h"
 
 #ifdef DEBUG_IO
 #define DEBUG DEBUG_M
diff --git a/loader.c b/loader.c
index 20d1c3ff1753de0f22c71d5b09b87247eb7046ff..44945e73e5208c5c43a5efdf04983d3e1568afbd 100755
--- a/loader.c
+++ b/loader.c
@@ -16,22 +16,22 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#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>
+#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 <asterisk/dlfcn-compat.h>
+#include "asterisk/dlfcn-compat.h"
 #else
 #include <dlfcn.h>
 #endif
-#include <asterisk/md5.h>
+#include "asterisk/md5.h"
 #include "asterisk.h"
 #include "astconf.h"
 
diff --git a/logger.c b/logger.c
index 857b8c3930f48e53ba36118c845c660e72c0111e..15d60d95be8baf11252cff59d6b352527739d286 100755
--- a/logger.c
+++ b/logger.c
@@ -16,14 +16,14 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <time.h>
-#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 "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 <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -45,7 +45,7 @@ static int syslog_level_map[] = {
 
 #define SYSLOG_NLEVELS 6
 
-#include <asterisk/logger.h>
+#include "asterisk/logger.h"
 
 #define MAX_MSG_QUEUE 200
 
diff --git a/manager.c b/manager.c
index 00e955858125e3986e50ddf84eb0fda582483efc..eb4d22937dcfe5cb76dab27b8f7bc58c4ac5198f 100755
--- a/manager.c
+++ b/manager.c
@@ -26,20 +26,21 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
-#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>
+
+#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
 {
diff --git a/md5.c b/md5.c
index 708e7b805799c5061f417ec854ab0ad31f26f6d8..a20697121d7225ef83777b9133a070286a655afe 100755
--- a/md5.c
+++ b/md5.c
@@ -18,8 +18,8 @@
  * will fill a supplied 16-byte array with the digest.
  */
 #include <string.h>		/* for memcpy() */
-#include <asterisk/endian.h>
-#include <asterisk/md5.h>
+#include "asterisk/endian.h"
+#include "asterisk/md5.h"
 
 # if __BYTE_ORDER == __BIG_ENDIAN
 #  define HIGHFIRST 1
diff --git a/pbx.c b/pbx.c
index 0764f5922c8a35b98435d234d1b65241746414b6..68b55e126e82e120727915687b14a793c16a0c39 100755
--- a/pbx.c
+++ b/pbx.c
@@ -13,25 +13,25 @@
 
 #include <sys/types.h>
 #include <regex.h>
-#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 "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 <string.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index ff6f2fe82f0dd49c6c8ed423873f18dd378bc09c..41d97d2addca77d2f7ccf5466f4ebd6ad78a287f 100755
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -13,15 +13,15 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <asterisk/frame.h>
-#include <asterisk/utils.h>
+#include "asterisk/frame.h"
+#include "asterisk/utils.h"
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <asterisk/dundi.h>
+#include "asterisk/dundi.h"
 #include "dundi-parser.h"
-#include <asterisk/dundi.h>
+#include "asterisk/dundi.h"
 
 static void internaloutput(const char *str)
 {
diff --git a/pbx/dundi-parser.h b/pbx/dundi-parser.h
index cc2364f5181a97a5a7714e7a42e221ae42369c95..3ea701e5b9c927a512e753d38bfda66959f05c76 100755
--- a/pbx/dundi-parser.h
+++ b/pbx/dundi-parser.h
@@ -12,8 +12,8 @@
 #ifndef _DUNDI_PARSER_H
 #define _DUNDI_PARSER_H
 
-#include <asterisk/dundi.h>
-#include <asterisk/aes.h>
+#include "asterisk/dundi.h"
+#include "asterisk/aes.h"
 
 #define DUNDI_MAX_STACK 512
 #define DUNDI_MAX_ANSWERS	100
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index a0e1d9ec105dae9b2d0ce6c239a531f8b003aba3..83488437e6ffbaedaee7cade4fb79d56d02a07fc 100755
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -12,20 +12,20 @@
  */
 
 #include <sys/types.h>
-#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 "asterisk/pbx.h"
+#include "asterisk/config.h"
+#include "asterisk/module.h"
+#include "asterisk/logger.h"
+#include "asterisk/cli.h"
+#include "asterisk/callerid.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 /* 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)
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 1c198c0e41ba048b1095edbf5e6016d94e7ca857..b80867b29eb2d62bed9ad9dbab991a6bea553001 100755
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -9,26 +9,26 @@
  * of the GNU General Public License.
  */
 
-#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 "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 <stdlib.h>
diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index ce8189a6a68f85de6167b764a45c410eb33ecb62..9394b641cb6fe8b63e84f87a48a1b239064d401e 100755
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -20,13 +20,13 @@
  */
 
 #include <sys/types.h>
-#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 "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 <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -39,8 +39,8 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 /* For where to put dynamic tables */
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
 
 AST_MUTEX_DEFINE_STATIC(verb_lock);
 
diff --git a/pbx/pbx_kdeconsole_main.cc b/pbx/pbx_kdeconsole_main.cc
index 9f43ee88f5cb4689dd6652b5992d217711ebc860..0bb2d73e2acd5e7292d8253c3d20dd9b9d53a138 100755
--- a/pbx/pbx_kdeconsole_main.cc
+++ b/pbx/pbx_kdeconsole_main.cc
@@ -11,10 +11,10 @@
  * the GNU General Public License
  */
 
-#include <asterisk/module.h>
-#include <asterisk/channel.h>
-#include <asterisk/logger.h>
-#include <asterisk/lock.h>
+#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";
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index d6f35c6dabbeba6a85618e5090fd8554c84d16f4..8fb7b3f7ebec92cb3b1c34f0106effe554315e1e 100755
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -9,25 +9,25 @@
  * of the GNU General Public License.
  */
 
-#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 "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 <stdlib.h>
 #include <unistd.h>
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 2d5eeacc954e4eb6095aa33182208acc46438358..8574a6675bbdc7718228d4f1a59b58416b5e6680 100755
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -9,27 +9,27 @@
  * of the GNU General Public License.
  */
 
-#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 "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 <stdlib.h>
 #include <unistd.h>
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 0abf970425ed39e1e6ad96bf6200e32cbb24d9eb..4551c0cf83e49d62e50560ce52d28f7850fa2cfe 100755
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.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/callerid.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.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/callerid.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
 #include <sys/stat.h>
 #include <errno.h>
 #include <time.h>
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../astconf.h"
+#include "astconf.h"
 
 /*
  * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality...
diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index 632c79fa824cd7cf581b88db94e5296db1584253..5b86ba5bb5775bec1aff6f2a9cf0e6666996c75b 100755
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -17,22 +17,22 @@
  *  "tech/tele,filename&" ie. "tor1/23,file&"
  */
  
-#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/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 <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include "../astconf.h"
+#include "astconf.h"
 
 
 /* Globals */
diff --git a/plc.c b/plc.c
index 9b2228e7e61610fc1d3c44e2bdf911262506b257..08f67c21bc5d9cc9a298053b7c881d12dd74cd67 100755
--- a/plc.c
+++ b/plc.c
@@ -35,7 +35,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include <asterisk/plc.h>
+#include "asterisk/plc.h"
 
 #if !defined(FALSE)
 #define FALSE 0
diff --git a/poll.c b/poll.c
index 7a9d14e7a2e416eb3926048ec4c94c5aa3fa0a9f..bd283866d40da4b644fc8a624eefc8763b5ef4e1 100755
--- a/poll.c
+++ b/poll.c
@@ -77,7 +77,7 @@
 #include <assert.h>                          /* assertion macros */
 #include <string.h>                          /* string functions */
 
-#include <asterisk/poll-compat.h>                            /* this package */
+#include "asterisk/poll-compat.h"                            /* this package */
 
 /*---------------------------------------------------------------------------*\
 				  Macros
diff --git a/privacy.c b/privacy.c
index bd50c3f1f2ce0552525192b6812889bd25d7d514..0fbcc73d49bb3c9b1f8d3cab563b7c176636d946 100755
--- a/privacy.c
+++ b/privacy.c
@@ -19,17 +19,18 @@
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
-#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/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)
diff --git a/res/res_adsi.c b/res/res_adsi.c
index a957f546d5b2ea1cbc6ce5a068bcd982f9fc4e07..82c05073a21851ac2cb4672b7ccb3cffcec46635 100755
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -21,16 +21,16 @@
 #include <unistd.h>
 #include <math.h>
 #include <errno.h>
-#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>
+#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
 
diff --git a/res/res_agi.c b/res/res_agi.c
index 7c7f6e3d95895d9c9021f037d6026372204eb323..d9b650dc296d66a3ce8da0efff86883804ecff02 100755
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -17,13 +17,13 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.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/callerid.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/callerid.h"
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -34,22 +34,22 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.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"
+#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 <asterisk/astmm.h>
+#include "asterisk/astmm.h"
 #endif
 
 #define MAX_ARGS 128
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 7e1d146d5a1f125ca6538df2395f559439502427..4a1080a3c2363e3e216bee491a16767fff5f3abe 100755
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -9,19 +9,19 @@
  * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com>
  */
 
-#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 "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 <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <asterisk/res_odbc.h>
-#include <asterisk/utils.h>
+#include "asterisk/res_odbc.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "ODBC Configuration";
 STANDARD_LOCAL_USER;
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 9f58394f62c51ac44ecb5603eb95b45b97a13d42..13e4c2dbc88cb7881f6558a05f0d7ea1abc6ef0b 100755
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -12,18 +12,18 @@
  */
 
 #include <sys/types.h>
-#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 "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 <openssl/ssl.h>
 #include <openssl/err.h>
 #include <stdio.h>
@@ -32,8 +32,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
 
 /*
  * Asterisk uses RSA keys with SHA-1 message digests for its
diff --git a/res/res_features.c b/res/res_features.c
index 508a2e6908d9156ce5492b1e5cb2a3f43a902099..b177549d9f104f159b251347cced64a288dc71d4 100755
--- a/res/res_features.c
+++ b/res/res_features.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/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 "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 <pthread.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/res/res_indications.c b/res/res_indications.c
index cc744ec55a9c990423bc4fc840c733bcf2163b0f..0b6d74f2ac0f48e6a03c56389b7644a887d4c562 100755
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -21,16 +21,16 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#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>
+#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 */
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 905e681b4bd965402cf602f7cc9c234b1cb2fabb..b775145202add6080bf333f4495d7216ab7f373c 100755
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -6,20 +6,20 @@
 #include <sys/stat.h>
 #include <libgen.h>		/* dirname() */
 
-#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"
+#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"
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 6ba33b3caaffb65c6025656f2f3fc920a3a92b55..df018b429683b93cca7517d63dec9ff38aa70caa 100755
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.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 <../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 "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 <stdlib.h>
-#include <asterisk/cli.h>
+#include "asterisk/cli.h"
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/res/res_odbc.c b/res/res_odbc.c
index c8408177bf5f404bd76b64f4aa725e6910760646..c4955980d5bea8b06a3480b8558d839d9e57c22c 100755
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -9,19 +9,19 @@
  * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com>
  */
 
-#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 "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 <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <asterisk/res_odbc.h>
+#include "asterisk/res_odbc.h"
 #define MAX_ODBC_HANDLES 25
 
 struct odbc_list
diff --git a/res/res_osp.c b/res/res_osp.c
index bcf7bef9c52512f3235de8774972b67bfddcd400..570df78b1c8e41e4dd4599a05cb77c91c1415825 100755
--- a/res/res_osp.c
+++ b/res/res_osp.c
@@ -13,23 +13,23 @@
 
 #include <sys/types.h>
 #include <osp.h>
-#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 "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 <openssl/err.h>
 #include <stdio.h>
 #include <dirent.h>
@@ -37,8 +37,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+#include "asterisk.h"
+#include "astconf.h"
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
diff --git a/rtp.c b/rtp.c
index ef0861b322a723ba89953459b6200d97e44044c0..544044a22c53ee4dde287604fdae3139bdbacef7 100755
--- a/rtp.c
+++ b/rtp.c
@@ -26,18 +26,18 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 
-#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>
+#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
 
diff --git a/say.c b/say.c
index 1b32ac4f13947ad468bd567c38707eceb95327bf..916095231a9ad2e6495309a342e5f51a55b47313 100755
--- a/say.c
+++ b/say.c
@@ -21,13 +21,13 @@
 #include <time.h>
 #include <ctype.h>
 #include <math.h>
-#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/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 <stdio.h>
 
diff --git a/sched.c b/sched.c
index 52d9397525cb26be607216a18ab442e0e1c7b76b..723c44a32b72ce0b1e9624cddbcfdea53270e6da 100755
--- a/sched.c
+++ b/sched.c
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <asterisk/sched.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/lock.h>
+#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) || \
diff --git a/srv.c b/srv.c
index ab44e55ac9873978894a581eaf6e38cd7a1be3fb..b7b097d9e156696032b253d144e99609f836feaa 100755
--- a/srv.c
+++ b/srv.c
@@ -22,12 +22,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <asterisk/channel.h>
-#include <asterisk/logger.h>
-#include <asterisk/srv.h>
-#include <asterisk/dns.h>
-#include <asterisk/options.h>
-#include <asterisk/utils.h>
+#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
diff --git a/stdtime/localtime.c b/stdtime/localtime.c
index 7adaabf1df2255a08382ae0da7cf31dbf8f3534f..2a82da949f112ea341fb0ed5a7c4cb8a62711c92 100755
--- a/stdtime/localtime.c
+++ b/stdtime/localtime.c
@@ -26,8 +26,8 @@
 #endif
 #define TZ_STRLEN_MAX	255
 /* #define DEBUG */
-#include <asterisk/lock.h>
-#include <asterisk/localtime.h>
+#include "asterisk/lock.h"
+#include "asterisk/localtime.h"
 
 
 #ifndef lint
diff --git a/tdd.c b/tdd.c
index a3664e82ed80bca77fcda99ba1716303740daeaa..e7c64ac07737364270e100f2616af6b78e5bee20 100755
--- a/tdd.c
+++ b/tdd.c
@@ -21,10 +21,10 @@
 #include <unistd.h>
 #include <math.h>
 #include <ctype.h>
-#include <asterisk/ulaw.h>
-#include <asterisk/tdd.h>
-#include <asterisk/logger.h>
-#include <asterisk/fskmodem.h>
+#include "asterisk/ulaw.h"
+#include "asterisk/tdd.h"
+#include "asterisk/logger.h"
+#include "asterisk/fskmodem.h"
 #include "ecdisa.h"
 
 
diff --git a/term.c b/term.c
index 528d63192aada892c26ecd8478b4c7fb19fcaf70..0cef17ec3349715e2aca32ae95dd18b1e285aa6d 100755
--- a/term.c
+++ b/term.c
@@ -21,9 +21,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <asterisk/term.h>
-#include <asterisk/options.h>
-#include <asterisk/lock.h>
+#include "asterisk/term.h"
+#include "asterisk/options.h"
+#include "asterisk/lock.h"
 #include "asterisk.h"
 
 static int vt100compat = 0;
diff --git a/translate.c b/translate.c
index b1c7162a38438f0274cdd453dce5d61ce3bffe45..97ece832a67b2374d74d67fefd77169c2bb53750 100755
--- a/translate.c
+++ b/translate.c
@@ -11,15 +11,15 @@
  * the GNU General Public License
  */
 
-#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 "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 <sys/socket.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/ulaw.c b/ulaw.c
index 2f90d21160ca7c7c76a7712688d3eafb3f613bc5..37ab25488951033b3c32b85757ae0d5127c85474 100755
--- a/ulaw.c
+++ b/ulaw.c
@@ -11,7 +11,7 @@
  * the GNU General Public License
  */
 
-#include <asterisk/ulaw.h>
+#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 */
diff --git a/utils.c b/utils.c
index b485fd3bb020b7c671ed6a0075b175662e0957da..4ae07f8368eb52a1dad266bc491195636ef385a7 100755
--- a/utils.c
+++ b/utils.c
@@ -22,11 +22,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <asterisk/lock.h>
-#include <asterisk/utils.h>
-#include <asterisk/io.h>
-#include <asterisk/logger.h>
-#include <asterisk/md5.h>
+#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];
diff --git a/utils/astman.c b/utils/astman.c
index 036111a80fb6bf60f540c00997eeb30d3bbbb9c3..9e68a3b1e4ed68abb8410539b97d0f5b37b8a949 100755
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -20,8 +20,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <asterisk/md5.h>
-#include <asterisk/manager.h>
+#include "asterisk/md5.h"
+#include "asterisk/manager.h"
 
 #undef gethostbyname