use double-quotes instead of angle-brackets for non-system include files (bug #4058)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5490 f38db490-d61c-443f-a65b-d21fe96a405b

21 files changed, 298 insertions, 298 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index ac8be55cd..46427e2cb 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 cde0e9e2d..215a55ef0 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 9ddfc5416..8db531d3c 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 9b83f779f..351237b70 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 928ec8aa6..b4b14c8b0 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 05a20992e..bc177f676 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 82ed6edf5..78f7d3749 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 64c73aa38..ad80e3e48 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 4d18137f0..c14a8f6d4 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 ec24369dc..aff1d5df9 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 bb032e2b5..130ecdb81 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 184b694dd..fb5809cc0 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 6a580d48c..809fdba08 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 7208ea09e..20290aba0 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 4c33cc408..0df1dc7d5 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 677157abf..bbb336c47 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 7b47772a5..af1199c3b 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 2e18dcbd8..7b41aa2bf 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 a21fc5b54..cf1c33c31 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 61038c338..34b5ae927 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 dc31e33c8..5feec89a7 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>