diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h
index 1a4d55edb6c6c3bf6944da71fef2c1b39efde4d8..65eefb7c604fa13418c14f9bce4d6ec34a9894e3 100644
--- a/addons/chan_ooh323.h
+++ b/addons/chan_ooh323.h
@@ -16,7 +16,7 @@
 #ifndef _OO_CHAN_H323_H_
 #define _OO_CHAN_H323_H_
 
-#include <asterisk.h>
+#include "asterisk.h"
 #undef PACKAGE_NAME
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
@@ -40,29 +40,29 @@
 #include <signal.h>
 #include <sys/signal.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/utils.h>
-#include <asterisk/options.h>
-#include <asterisk/sched.h>
-#include <asterisk/io.h>
-#include <asterisk/causes.h>
-#include <asterisk/rtp_engine.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/dsp.h>
-#include <asterisk/stringfields.h>
-#include <asterisk/frame_defs.h>
-#include <asterisk/udptl.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/utils.h"
+#include "asterisk/options.h"
+#include "asterisk/sched.h"
+#include "asterisk/io.h"
+#include "asterisk/causes.h"
+#include "asterisk/rtp_engine.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/dsp.h"
+#include "asterisk/stringfields.h"
+#include "asterisk/frame_defs.h"
+#include "asterisk/udptl.h"
 
 #include "ootypes.h"
 #include "ooUtils.h"
diff --git a/addons/mp3/common.c b/addons/mp3/common.c
index d8db2a3d295e75435db6c5c473dc0734c3df6f39..9a6fd8c13202d980aabd10c18f8acb5164460def 100644
--- a/addons/mp3/common.c
+++ b/addons/mp3/common.c
@@ -1,5 +1,5 @@
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/addons/mp3/decode_ntom.c b/addons/mp3/decode_ntom.c
index b231f439f6bee49a0e32ec5769a8de0633d3e366..e6b10a4c1616d6fe37a3ae1a9c0403093c9481b4 100644
--- a/addons/mp3/decode_ntom.c
+++ b/addons/mp3/decode_ntom.c
@@ -7,8 +7,8 @@
  * N->M down/up sampling. Not optimized for speed.
  */
 
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
diff --git a/addons/mp3/interface.c b/addons/mp3/interface.c
index 9ced5334261e7a0bc6f7df2afa9a3abee880d75c..a71d15df5721f0d778acb59dbabca7fcbe3223b2 100644
--- a/addons/mp3/interface.c
+++ b/addons/mp3/interface.c
@@ -1,5 +1,5 @@
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/addons/mp3/layer3.c b/addons/mp3/layer3.c
index 793c99633010224065ee3f8d17ea6772dd06557a..e6355764d1d1cf80aecc998667021281aabf9a01 100644
--- a/addons/mp3/layer3.c
+++ b/addons/mp3/layer3.c
@@ -5,8 +5,8 @@
  * All rights reserved. See also 'README'
  */ 
 
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 #include <stdlib.h>
 #include "mpg123.h"
 #include "mpglib.h"
diff --git a/addons/ooh323c/src/context.c b/addons/ooh323c/src/context.c
index f2dc1119b89b9a66d24e97ed8e798a72b64762ac..46f1fc8c06b5691b40f4149ef1d398eb1690072e 100644
--- a/addons/ooh323c/src/context.c
+++ b/addons/ooh323c/src/context.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 #include <stdlib.h>
diff --git a/addons/ooh323c/src/decode.c b/addons/ooh323c/src/decode.c
index c80a481ba6d07a190460ecdfecaead367c0f3ce0..643901e7d7fbe0f0ab45623c96ebe30db9431c2b 100644
--- a/addons/ooh323c/src/decode.c
+++ b/addons/ooh323c/src/decode.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 
diff --git a/addons/ooh323c/src/dlist.c b/addons/ooh323c/src/dlist.c
index 9a9bfbb4c975a913cc1f095ad99d7772f7edc7b9..6e110e17b5f86e74ebc45a65306229cd7e62ed12 100644
--- a/addons/ooh323c/src/dlist.c
+++ b/addons/ooh323c/src/dlist.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 
diff --git a/addons/ooh323c/src/encode.c b/addons/ooh323c/src/encode.c
index 099e6e9ec1e12a5cb7ff29dc4efc43adabb5716b..22fc1f31d3bc761398b00a6076f4f0d0bbb3285f 100644
--- a/addons/ooh323c/src/encode.c
+++ b/addons/ooh323c/src/encode.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 
 #include "ooasn1.h"
diff --git a/addons/ooh323c/src/errmgmt.c b/addons/ooh323c/src/errmgmt.c
index 2b8c41feb3dda1844492b1a27a8786ac0640c2ee..de660c5fd1571bc039d591f3309e4ccca23ef22b 100644
--- a/addons/ooh323c/src/errmgmt.c
+++ b/addons/ooh323c/src/errmgmt.c
@@ -16,8 +16,8 @@
 
 /* Error management functions */
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 #include "ooasn1.h"
 
diff --git a/addons/ooh323c/src/eventHandler.c b/addons/ooh323c/src/eventHandler.c
index 080117f97ea6cc9e8b148d517bd2e815ec3c7e9b..82e1eb435914e37e3c7ae068b3eac2e4ca76d84d 100644
--- a/addons/ooh323c/src/eventHandler.c
+++ b/addons/ooh323c/src/eventHandler.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "eventHandler.h"
 
diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c
index d60b7a074ef4ab194a9d24473cae37a301fde534..99ed06ba7c0f29a5346fd3bfb24b6b83401e6934 100644
--- a/addons/ooh323c/src/memheap.c
+++ b/addons/ooh323c/src/memheap.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 #include "memheap.h"
 
diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 6648c3fe2ab06e14697473a1507b8144da32999f..71d63092dbff85501f00cadcfca6f8ac49cfa587 100644
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ootrace.h"
 #include "ootypes.h"
diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c
index 09dc3b95ea468c2e7b7619a7418eb31e5da51aba..3918640182e4ba3636474b08b92ed445e51b34d0 100644
--- a/addons/ooh323c/src/ooCapability.c
+++ b/addons/ooh323c/src/ooCapability.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooCapability.h"
 #include "ootrace.h"
diff --git a/addons/ooh323c/src/ooCmdChannel.c b/addons/ooh323c/src/ooCmdChannel.c
index 27a28a28242019c2a7bd55bd7f6c4ab44982663f..d88ac7942d0b1ee44b3563b9c9b59a686b8091a7 100644
--- a/addons/ooh323c/src/ooCmdChannel.c
+++ b/addons/ooh323c/src/ooCmdChannel.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "ooStackCmds.h"
 #include "ootrace.h"
 #include "ooq931.h"
diff --git a/addons/ooh323c/src/ooGkClient.c b/addons/ooh323c/src/ooGkClient.c
index 534f2205c3870ece908fa811ae1f576a77d62f06..e5c6361e4fa5e84359bad313ce8d0b346a308824 100644
--- a/addons/ooh323c/src/ooGkClient.c
+++ b/addons/ooh323c/src/ooGkClient.c
@@ -20,8 +20,8 @@
  * This file contains functions to support RAS protocol. 
  *
  */
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooGkClient.h"
 #include "ootypes.h"
diff --git a/addons/ooh323c/src/ooLogChan.c b/addons/ooh323c/src/ooLogChan.c
index dfd16c3057e669df5d28b281a4ef9a2c4a3214ed..b230edef42ae4e1f3671353b2842be1d468e4686 100644
--- a/addons/ooh323c/src/ooLogChan.c
+++ b/addons/ooh323c/src/ooLogChan.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooCalls.h"
 #include "ooh323ep.h"
diff --git a/addons/ooh323c/src/ooStackCmds.c b/addons/ooh323c/src/ooStackCmds.c
index 4c732d538b29f5c4737dad42269819e6f0e13147..29878789e308ed2da4450fcb6d1df9151ae7b665 100644
--- a/addons/ooh323c/src/ooStackCmds.c
+++ b/addons/ooh323c/src/ooStackCmds.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooStackCmds.h"
 #include "ooh323ep.h"
diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c
index bd04715ff6de55754a956c265c8cf784b3e355a0..9e7f7227a8ee9167eec8b0d0a7754d5a9e0237b0 100644
--- a/addons/ooh323c/src/ooTimer.c
+++ b/addons/ooh323c/src/ooTimer.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooDateTime.h"
 #include "ooTimer.h"
diff --git a/addons/ooh323c/src/ooUtils.c b/addons/ooh323c/src/ooUtils.c
index 4c08e247c6c29ff588d583a6539baf4e186ac522..7b5321b6d6e3dbc594178818c8a1e4f87abee8fc 100644
--- a/addons/ooh323c/src/ooUtils.c
+++ b/addons/ooh323c/src/ooUtils.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "ooUtils.h"
 #include <ctype.h>
 
diff --git a/addons/ooh323c/src/ooasn1.h b/addons/ooh323c/src/ooasn1.h
index 86a9b80c8b80957e1f3ed791ad7b0d73ef5d6974..e7b585eb1ec2329ed36ddb2d4432f4d072e1a382 100644
--- a/addons/ooh323c/src/ooasn1.h
+++ b/addons/ooh323c/src/ooasn1.h
@@ -22,8 +22,8 @@
 #ifndef _OOASN1_H_
 #define _OOASN1_H_
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c
index 7d8c1ab723ef85991508c1c6413435efe0a853f6..42f00a9e8ba097ebad1c832e269c67863cf58d78 100644
--- a/addons/ooh323c/src/oochannels.c
+++ b/addons/ooh323c/src/oochannels.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooports.h" 
 #include "oochannels.h"
diff --git a/addons/ooh323c/src/ooh245.c b/addons/ooh323c/src/ooh245.c
index 9eee543162873349b51eebcd410e531ca380bcee..d42f8bbc1760341a110efa333d1576938f602cf0 100644
--- a/addons/ooh323c/src/ooh245.c
+++ b/addons/ooh323c/src/ooh245.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "ooh245.h"
 #include "ooCalls.h"
 #include "printHandler.h"
diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c
index 21eab1fa32d1015f2f296d19a1d37d797ca95873..8f6b4cb2854f7210b0546c2f856155651dd8400d 100644
--- a/addons/ooh323c/src/ooh323.c
+++ b/addons/ooh323c/src/ooh323.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <time.h>
 
 #include "ootypes.h"
diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c
index 77c368b0b7a821c4b2024f32286c5ab8eb18c205..1d5d9579ed87f88ba1fa071dbd01b4fe638bb7e8 100644
--- a/addons/ooh323c/src/ooh323ep.c
+++ b/addons/ooh323c/src/ooh323ep.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooh323ep.h"
 #include "ootrace.h"
diff --git a/addons/ooh323c/src/ooports.c b/addons/ooh323c/src/ooports.c
index 2b9cc09ff9b5914429118324bccfae35dcc7e534..3b2efb8d5c5ccc40c47379288167a00d9031390f 100644
--- a/addons/ooh323c/src/ooports.c
+++ b/addons/ooh323c/src/ooports.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooports.h"
 #include "ooh323ep.h"
diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 307aba5a68be03ae9b79ba2777647d8758ab22f0..626f9693917f710b97e5f053394e2099eeadc147 100644
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include <time.h>
 
diff --git a/addons/ooh323c/src/ootrace.c b/addons/ooh323c/src/ootrace.c
index a688a390c2ee7ac54df3d123683370b358c9fead..ba77e7fd1af218d839cc52f14ef7230d21046bb1 100644
--- a/addons/ooh323c/src/ootrace.c
+++ b/addons/ooh323c/src/ootrace.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/addons/ooh323c/src/perutil.c b/addons/ooh323c/src/perutil.c
index 4d9a84eb50298042a70ffc0b57d05407f3fa9995..c6a608ca7dd380d0cd9c8afbbc901e6200511cca 100644
--- a/addons/ooh323c/src/perutil.c
+++ b/addons/ooh323c/src/perutil.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 #include "ooper.h"
diff --git a/addons/ooh323c/src/printHandler.c b/addons/ooh323c/src/printHandler.c
index 47c511f9698f01888d9e1054db38bdd4f1a415d5..abb4d4f2de76cfebde8bf0ddbb75d33a699e3955 100644
--- a/addons/ooh323c/src/printHandler.c
+++ b/addons/ooh323c/src/printHandler.c
@@ -17,8 +17,8 @@
    the fields of an encoded PER message to stdout in a structured output 
    format..
 */
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include <stdlib.h>
 /* #ifdef HAVE_MALLOC_H
diff --git a/addons/ooh323c/src/rtctype.c b/addons/ooh323c/src/rtctype.c
index ea51bdbd38605d0376e38855757f6df5cca827c5..8dfe4e3fa9bf0117296b1593a60c3ca3f8585b02 100644
--- a/addons/ooh323c/src/rtctype.c
+++ b/addons/ooh323c/src/rtctype.c
@@ -16,8 +16,8 @@
 
 /* Run-time ctype substitution */
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 #include "rtctype.h"
diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c
index e912f1f162f0f964b7a704cc71cd42b90ab2341a..dd07bb4b017d240c4e7aa8a68a403c94d468237c 100644
--- a/addons/ooh323cDriver.c
+++ b/addons/ooh323cDriver.c
@@ -16,11 +16,11 @@
 
 #include "ooh323cDriver.h"
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
-#include <asterisk/pbx.h>
-#include <asterisk/logger.h>
+#include "asterisk/pbx.h"
+#include "asterisk/logger.h"
 
 #undef AST_BACKGROUND_STACKSIZE
 #define AST_BACKGROUND_STACKSIZE 768 * 1024
diff --git a/addons/ooh323cDriver.h b/addons/ooh323cDriver.h
index d29520646786b651b49381f08c4d3f4dee09025a..269c56a719c37ce79ca4ecabaf183657c3fa2545 100644
--- a/addons/ooh323cDriver.h
+++ b/addons/ooh323cDriver.h
@@ -22,7 +22,7 @@
 #include "ooCalls.h"
 #include "ooCapability.h"
 #include "ooStackCmds.h"
-#include <asterisk/frame_defs.h>
+#include "asterisk/frame_defs.h"
 #define H323_DTMF_RFC2833          (1 << 0)
 #define H323_DTMF_Q931             (1 << 1)
 #define H323_DTMF_H245ALPHANUMERIC (1 << 2)