Remove pthread.h from source. We should be using asterisk/lock.h everywhere instead (except in asterisk/lock.h).

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

67 files changed, 20 insertions, 72 deletions

diff --git a/acl.c b/acl.c
index 4feea75a7..3f0afb9ab 100755
--- a/acl.c
+++ b/acl.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -23,6 +22,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/app.c b/app.c
index f041bd323..813d35842 100755
--- a/app.c
+++ b/app.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -28,6 +27,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/options.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "asterisk.h"
 #include "astconf.h"
 
diff --git a/astmm.c b/astmm.c
index 6b98c557d..c249091ee 100755
--- a/astmm.c
+++ b/astmm.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <pthread.h>
 #include <time.h>
 #include <asterisk/cli.h>
 #include <asterisk/logger.h>
diff --git a/autoservice.c b/autoservice.c
index 2f28f35a7..98a963353 100755
--- a/autoservice.c
+++ b/autoservice.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -33,6 +32,7 @@
 #include <asterisk/chanvars.h>
 #include <asterisk/linkedlists.h>
 #include <asterisk/indications.h>
+#include <asterisk/lock.h>
 
 #define MAX_AUTOMONS 256
 
diff --git a/cdr.c b/cdr.c
index 4d9e492a9..0c6796daf 100755
--- a/cdr.c
+++ b/cdr.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;
 char ast_default_accountcode[20] = "";
diff --git a/channel.c b/channel.c
index 83e39ed57..638ecfeec 100755
--- a/channel.c
+++ b/channel.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -38,6 +37,7 @@
 #include <asterisk/monitor.h>
 #include <asterisk/causes.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #ifdef ZAPTEL_OPTIMIZATIONS
 #include <sys/ioctl.h>
 #ifdef __linux__
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index bdbefe232..0e469fb85 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 622b71f17..a2e88662c 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -28,7 +28,6 @@
 
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/logger.h>
diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 055f303ec..cb028557d 100755
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -43,7 +43,6 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <signal.h>
 #include <sys/signal.h>
 
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index dad6707ba..0d60b963a 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -45,7 +45,6 @@
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/channels/chan_local.c b/channels/chan_local.c
index b4426825b..758777a85 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b00168eeb..f96e9c90d 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -49,7 +49,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -84,7 +83,6 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index c2f7e6187..ace64c78e 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 700dcc643..b30e1fadb 100755
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index f699ee0bb..69c0884bd 100755
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f7befec62..ddb4d8a6e 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -49,7 +48,6 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <pthread.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <netinet/in_systm.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index d73ce62b8..227a9e206 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -51,7 +50,6 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <asterisk/dsp.h>
 #include <ctype.h>
 
diff --git a/channels/chan_vofr.c b/channels/chan_vofr.c
index 7ab952dc2..43e7271d9 100755
--- a/channels/chan_vofr.c
+++ b/channels/chan_vofr.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 8344ccba3..bd4576b8f 100755
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -14,7 +14,6 @@
 
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
diff --git a/cli.c b/cli.c
index 6543a0bf0..1376ed257 100755
--- a/cli.c
+++ b/cli.c
@@ -20,11 +20,11 @@
 #include <asterisk/channel.h>
 #include <asterisk/channel_pvt.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <sys/signal.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
-#include <pthread.h>
 /* For rl_filename_completion */
 #include "editline/readline/readline.h"
 /* For module directory */
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 84d23a146..09b8e02bc 100755
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -19,7 +19,6 @@
 #include <asterisk/ulaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 9aa0304c7..7bc75075d 100755
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -20,7 +20,6 @@
 #include <asterisk/channel.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 5574cd451..6ba4e1da9 100755
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -18,7 +18,6 @@
 #include <asterisk/alaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
index 3692b56ab..48b85e8dd 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 <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 3dad026dd..de3e6c73d 100755
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -20,7 +20,6 @@
 #include <asterisk/channel.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 8e37c70ec..286dc4fb8 100755
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -24,7 +24,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 947921249..5756d9ce9 100755
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -18,7 +18,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 2b054710a..9ec7a7ee2 100755
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -22,7 +22,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 4bd5155dd..5c44a0aef 100755
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -23,7 +23,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 55ff81e1c..698733a3c 100755
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -18,7 +18,6 @@
 #include <asterisk/ulaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/db.c b/db.c
index 4842b71de..128547fde 100755
--- a/db.c
+++ b/db.c
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -33,6 +32,7 @@
 #include <asterisk/astdb.h>
 #include <asterisk/cli.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "db1-ast/include/db.h"
 #include "asterisk.h"
 #include "astconf.h"
diff --git a/file.c b/file.c
index 1e896e8cd..d5d1f8e94 100755
--- a/file.c
+++ b/file.c
@@ -20,11 +20,11 @@
 #include <asterisk/options.h>
 #include <asterisk/translate.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <dirent.h>
diff --git a/formats/format_g723.c b/formats/format_g723.c
index cf5228f8b..955ce5916 100755
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #include <sys/time.h>
 #include "../channels/adtranvofr.h"
 
diff --git a/formats/format_g726.c b/formats/format_g726.c
index acb44c728..9788a28b4 100755
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 9f7531d5f..746874d7d 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 619786e56..f4b5aa189 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_h263.c b/formats/format_h263.c
index dd8a21454..1482e5b5d 100755
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 0d50900d9..61b9d5958 100755
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index db7c2096e..56c5ef8d8 100755
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -18,6 +18,7 @@
 #include <asterisk/sched.h>
 #include <asterisk/module.h>
 #include <asterisk/image.h>
+#include <asterisk/lock.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -26,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 2ad29471c..3c1cbe3cb 100755
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index 55911d8f3..eda446ca4 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 92f4f4e56..1a09dac52 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 804c38c4e..0e87f2de9 100755
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index a9f9df838..6ed2c6471 100755
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else
diff --git a/frame.c b/frame.c
index f8905ca95..7ee6c77ae 100755
--- a/frame.c
+++ b/frame.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
 #include "asterisk.h"
 
diff --git a/image.c b/image.c
index f0c21035f..211534e40 100755
--- a/image.c
+++ b/image.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -29,6 +28,7 @@
 #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/include/asterisk/channel.h b/include/asterisk/channel.h
index 758670f28..e4421c1b1 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -19,7 +19,6 @@
 #include <asterisk/chanvars.h>
 #include <unistd.h>
 #include <setjmp.h>
-#include <pthread.h>
 #include <sys/poll.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index b752b3adb..6fd778792 100755
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -1,7 +1,6 @@
 #ifndef ASTERISK_LINKEDLISTS_H
 #define ASTERISK_LINKEDLISTS_H
 
-#include <pthread.h>
 #include <asterisk/lock.h>
 
 #define AST_LIST_LOCK(head)						\
diff --git a/indications.c b/indications.c
index 25b98a0ca..b4ba6d33c 100755
--- a/indications.c
+++ b/indications.c
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <math.h>			/* For PI */
 #include <asterisk/indications.h>
@@ -26,6 +25,7 @@
 #include <asterisk/options.h>
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
+#include <asterisk/lock.h>
 
 struct playtones_item {
 	int freq1;
diff --git a/loader.c b/loader.c
index d6108f8f6..c6a0ca24d 100755
--- a/loader.c
+++ b/loader.c
@@ -26,13 +26,13 @@
 #include <asterisk/manager.h>
 #include <asterisk/enum.h>
 #include <asterisk/rtp.h>
+#include <asterisk/lock.h>
 #ifdef __APPLE__
 #include <asterisk/dlfcn-compat.h>
 #else
 #include <dlfcn.h>
 #endif
 #include <asterisk/md5.h>
-#include <pthread.h>
 #include "asterisk.h"
 #include "astconf.h"
 
diff --git a/logger.c b/logger.c
index 9ba890bd8..38eb195b5 100755
--- a/logger.c
+++ b/logger.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <pthread.h>
 #include <sys/stat.h>
 #include "asterisk.h"
 #include "astconf.h"
diff --git a/manager.c b/manager.c
index e16bdf8b3..cdf9234f0 100755
--- a/manager.c
+++ b/manager.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/pbx/pbx_kdeconsole_main.cc b/pbx/pbx_kdeconsole_main.cc
index 4ca3da5dd..9f43ee88f 100755
--- a/pbx/pbx_kdeconsole_main.cc
+++ b/pbx/pbx_kdeconsole_main.cc
@@ -14,7 +14,7 @@
 #include <asterisk/module.h>
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
-#include <pthread.h>
+#include <asterisk/lock.h>
 #include "pbx_kdeconsole.h"
 
 static char *dtext = "KDE Console Monitor";
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index b2a90c68b..eb3dd2bcb 100755
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -19,7 +19,6 @@
 #include <asterisk/module.h>
 #include <asterisk/options.h>
 #include <asterisk/utils.h>
-#include <pthread.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <time.h>
diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index c58795089..4f6fa8a38 100755
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/privacy.c b/privacy.c
index 9dcb4308d..bd50c3f1f 100755
--- a/privacy.c
+++ b/privacy.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -30,6 +29,7 @@
 #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_config_odbc.c b/res/res_config_odbc.c
index ffaccb8cb..dead1233b 100755
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -17,10 +17,10 @@
 #include <asterisk/config.h>
 #include <asterisk/config_pvt.h>
 #include <asterisk/module.h>
+#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <pthread.h>
 #include <asterisk/res_odbc.h>
 
 
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 2ebf4bef9..4e12eb5b7 100755
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -22,10 +22,10 @@
 #include <asterisk/md5.h>
 #include <asterisk/cli.h>
 #include <asterisk/io.h>
+#include <asterisk/lock.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <stdio.h>
-#include <pthread.h>
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
diff --git a/res/res_indications.c b/res/res_indications.c
index 78eb2a33d..f3bbc01ba 100755
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 6bef3a6d6..960f40d2b 100755
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -46,8 +46,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pthread.h>
-
 static char *app0 = "MusicOnHold";
 static char *app1 = "WaitMusicOnHold";
 static char *app2 = "SetMusicOnHold";
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 60e8cd243..b064b92d2 100755
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -19,10 +19,10 @@
 #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 <pthread.h>
 #include <asterisk/res_odbc.h>
 #define MAX_ODBC_HANDLES 25
 
diff --git a/res/res_parking.c b/res/res_parking.c
index 29db04136..7448ef9c9 100755
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -36,8 +36,6 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
-#include <pthread.h>
-
 #define DEFAULT_PARK_TIME 45000
 
 static char *parkedcall = "ParkedCall";
diff --git a/rtp.c b/rtp.c
index cb2dd2045..e311bdb9a 100755
--- a/rtp.c
+++ b/rtp.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -34,6 +33,7 @@
 #include <asterisk/channel.h>
 #include <asterisk/channel_pvt.h>
 #include <asterisk/config.h>
+#include <asterisk/lock.h>
 
 #define RTP_MTU		1200
 
diff --git a/sched.c b/sched.c
index 48417ef71..c088d36a0 100755
--- a/sched.c
+++ b/sched.c
@@ -21,12 +21,12 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <pthread.h>
 #include <string.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/term.c b/term.c
index 577d85adf..5522111b5 100755
--- a/term.c
+++ b/term.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -21,6 +20,7 @@
 #include <unistd.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 56f0e5e99..0e6d19b26 100755
--- a/translate.c
+++ b/translate.c
@@ -25,7 +25,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/utils.c b/utils.c
index d65f2a8e5..66ac2e247 100755
--- a/utils.c
+++ b/utils.c
@@ -12,7 +12,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include <pthread.h> 
 #include <asterisk/lock.h>
 #include <asterisk/utils.h>