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@3277 f38db490-d61c-443f-a65b-d21fe96a405b

58 files changed, 12 insertions, 94 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 2fa21f0eb..f4d18e231 100755
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -20,6 +20,7 @@
 #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>
@@ -29,8 +30,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <pthread.h>
-
 #include "../asterisk.h"
 #include "../astconf.h"
 
diff --git a/apps/app_agi.c b/apps/app_agi.c
index 991a9a5ed..51f04e846 100755
--- a/apps/app_agi.c
+++ b/apps/app_agi.c
@@ -37,11 +37,10 @@
 #include <asterisk/dsp.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "../asterisk.h"
 #include "../astconf.h"
 
-#include <pthread.h>
-
 #define MAX_ARGS 128
 
 /* Recycle some stuff from the CLI interface */
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index b8300f934..91317ae36 100755
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -39,7 +39,6 @@
 #include <math.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <pthread.h>
 #include <sys/time.h>
 
 #define ALMRCV_CONFIG "alarmreceiver.conf"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 4169e59a8..9b64c6cda 100755
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -26,8 +26,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <pthread.h>
-
 
 static char *tdesc = "Authentication Application";
 
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index a77777334..4438663ce 100755
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 
-#include <pthread.h>
-
 static char *tdesc = "Check if channel is available";
 
 static char *app = "ChanIsAvail";
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 2ec8de1b6..b44eafba9 100755
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -22,7 +22,6 @@
 #include <asterisk/utils.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Control Playback Application";
 
diff --git a/apps/app_datetime.c b/apps/app_datetime.c
index 97c1088f8..2f3cc4f20 100755
--- a/apps/app_datetime.c
+++ b/apps/app_datetime.c
@@ -23,9 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Date and Time";
 
 static char *app = "DateTime";
diff --git a/apps/app_db.c b/apps/app_db.c
index 64850c0ba..26af2c41b 100755
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -20,14 +20,12 @@
 #include <asterisk/channel.h>
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
-#include <asterisk/pbx.h>
 #include <asterisk/astdb.h>
+#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
-
 
 static char *tdesc = "Database access functions for Asterisk extension logic";
 
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 8b096c40c..b0a21fb85 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -36,8 +36,6 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
-#include <pthread.h>
-
 static char *tdesc = "Dialing Application";
 
 static char *app = "Dial";
diff --git a/apps/app_directory.c b/apps/app_directory.c
index f9499acae..cd164e55c 100755
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <stdio.h>
 #include "../asterisk.h"
 #include "../astconf.h"
diff --git a/apps/app_disa.c b/apps/app_disa.c
index cf199013d..132f86efa 100755
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-#include <pthread.h>
 #include <sys/time.h>
 
 /*
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 42355a2ff..09d8a5157 100755
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -22,9 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Simple Echo Application";
 
 static char *app = "Echo";
diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c
index 148477e99..bf81a4d33 100755
--- a/apps/app_enumlookup.c
+++ b/apps/app_enumlookup.c
@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "ENUM Lookup";
 
 static char *app = "EnumLookup";
diff --git a/apps/app_festival.c b/apps/app_festival.c
index c0352cbb2..6e895b69a 100755
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -20,6 +20,7 @@
 #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>
@@ -35,7 +36,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <pthread.h>
 
 
 #define FESTIVAL_CONFIG "festival.conf"
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 45d1e25cf..a4bf4e84e 100755
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Flash zap trunk application";
 
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index b4367499b..9aa0bc60b 100755
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -24,9 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Get ADSI CPE ID";
 
 static char *app = "GetCPEID";
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index ff660dc7e..62585f1c4 100755
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -37,14 +37,13 @@
 #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>
 #include <stdlib.h>
 #include <dirent.h>
 
-#include <pthread.h>
-
 #include "../astconf.h"
 
 static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder.";
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 294ecc604..395407dbe 100755
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <sys/time.h>
 #include <errno.h>
 #include "../astconf.h"
diff --git a/apps/app_image.c b/apps/app_image.c
index 6a46f0388..04af0a315 100755
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -21,7 +21,6 @@
 #include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Image Transmission Application";
 
diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 4462be180..5c2782433 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -24,7 +24,6 @@
 #include <sys/ioctl.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 
diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index 5760a0d9e..69743e377 100755
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -24,7 +24,6 @@
 #include <asterisk/astdb.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Look up Caller*ID name/number from blacklist database";
 
diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index c24a0dc1d..ecb0a4e5c 100755
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -24,7 +24,6 @@
 #include <asterisk/astdb.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Look up CallerID Name from local database";
 
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 781217337..dd53946bd 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -19,13 +19,12 @@
 #include <asterisk/module.h>
 #include <asterisk/options.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
 #define MAX_ARGS 80
 
 static char *tdesc = "Extension Macros";
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 14a652473..97e54a073 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <pthread.h>
 
 #ifdef __linux__
 #include <linux/zaptel.h>
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index dd14b60d4..6b9e6b763 100755
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <pthread.h>
-
 static char *tdesc = "Digital Milliwatt (mu-law) Test Application";
 
 static char *app = "Milliwatt";
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index a2e0ce22a..b7c6699ba 100755
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <sys/time.h>
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 892840ebb..75951de51 100755
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 59492887a..2faa92dc1 100755
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -25,14 +25,13 @@
 #include <asterisk/options.h>
 #include <asterisk/logger.h>
 #include <asterisk/say.h>
+#include <asterisk/lock.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
 static char *tdesc = "Call Parking and Announce Application";
 
 static char *app = "ParkAndAnnounce";
diff --git a/apps/app_playback.c b/apps/app_playback.c
index b547547a0..24a130a7d 100755
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -21,7 +21,6 @@
 #include <asterisk/utils.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Trivial Playback Application";
 
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index db5375eda..7628ea0e7 100755
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -25,7 +25,6 @@
 #include <asterisk/config.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 #define PRIV_CONFIG "privacy.conf"
 
diff --git a/apps/app_qcall.c b/apps/app_qcall.c
index e876f0ae3..33731b235 100755
--- a/apps/app_qcall.c
+++ b/apps/app_qcall.c
@@ -62,7 +62,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/apps/app_queue.c b/apps/app_queue.c
index e36bbda8e..c9e3ee998 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -55,8 +55,6 @@
 
 #include "../astconf.h"
 
-#include <pthread.h>
-
 #define QUEUE_STRATEGY_RINGALL		0
 #define QUEUE_STRATEGY_ROUNDROBIN	1
 #define QUEUE_STRATEGY_LEASTRECENT	2
diff --git a/apps/app_read.c b/apps/app_read.c
index 4cba132aa..cbc65f941 100755
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -23,7 +23,6 @@
 #include <asterisk/utils.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Read Variable Application";
 
diff --git a/apps/app_record.c b/apps/app_record.c
index 17b95160c..02676bd98 100755
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -21,7 +21,6 @@
 #include <asterisk/dsp.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Trivial Record Application";
 
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 9edd77f52..bf6a51d41 100755
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -50,7 +50,6 @@ enum {REM_OFF,REM_MONITOR,REM_TX};
 enum{ID,PROC,TERM,COMPLETE,UNKEY,REMDISC,REMALREADY,REMNOTFOUND,REMGO,
 	CONNECTED,CONNFAIL,STATUS};
 
-#include <pthread.h>
 #include <asterisk/lock.h>
 #include <asterisk/file.h>
 #include <asterisk/logger.h>
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 39de24f95..f60ee65ea 100755
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -23,7 +23,6 @@
 #include <asterisk/app.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Send DTMF digits Application";
 
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index e1920b6e1..73d24a189 100755
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -22,7 +22,6 @@
 #include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Send Text Applications";
 
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 2b0fdb61a..a84c7a036 100755
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -21,7 +21,6 @@
 #include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Set CallerID Application";
 
diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c
index 089d35f2f..c73af9a43 100755
--- a/apps/app_setcidname.c
+++ b/apps/app_setcidname.c
@@ -23,7 +23,6 @@
 #include <asterisk/utils.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Set CallerID Name";
 
diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c
index a4ded6b29..9aef3bacb 100755
--- a/apps/app_setcidnum.c
+++ b/apps/app_setcidnum.c
@@ -24,7 +24,6 @@
 #include <asterisk/utils.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Set CallerID Number";
 
diff --git a/apps/app_skel.c b/apps/app_skel.c
index f78652c55..68bdd9262 100755
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -16,10 +16,10 @@
 #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>
-#include <pthread.h>
 
 static char *tdesc = "Trivial skeleton Application";
 static char *app = "skel";
diff --git a/apps/app_sms.c b/apps/app_sms.c
index b935ae5cc..dc7c14aca 100755
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -27,8 +27,6 @@
 #include <dirent.h>
 #include <ctype.h>
 
-#include <pthread.h>
-
 /* ToDo */
 /* When acting as SC and answering, should check for messages and send instead of sending EST as first packet */
 /* Add full VP support */
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 43a42247c..02135beb0 100755
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -17,14 +17,12 @@
 #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>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *synopsis = "Soft Hangup Application";
 
 static char *tdesc = "Hangs up the requested channel";
diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c
index 8497927f7..b6e3e3c73 100755
--- a/apps/app_sql_postgres.c
+++ b/apps/app_sql_postgres.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <pthread.h>
 #include "libpq-fe.h"
 
 #define EXTRA_LOG 0
diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c
index cc82d99cb..600f0bdbf 100755
--- a/apps/app_striplsd.c
+++ b/apps/app_striplsd.c
@@ -17,14 +17,12 @@
 #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>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Strip trailing digits";
 
 static char *descrip =
diff --git a/apps/app_substring.c b/apps/app_substring.c
index 78d270eca..d2b2f8c0d 100755
--- a/apps/app_substring.c
+++ b/apps/app_substring.c
@@ -18,14 +18,12 @@
 #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>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "(Deprecated) Save substring digits in a given variable";
 
 static char *descrip =
diff --git a/apps/app_system.c b/apps/app_system.c
index 010137f99..4dfed7350 100755
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Generic System() application";
 
 static char *app = "System";
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 60219c2c8..79bac3859 100755
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -22,7 +22,6 @@
 #include <asterisk/dsp.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Playback with Talk Detection";
 
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 239161d58..826c93c05 100755
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -22,9 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "Transfer";
 
 static char *app = "Transfer";
diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c
index d4e24d97e..dd72ed097 100755
--- a/apps/app_txtcidname.c
+++ b/apps/app_txtcidname.c
@@ -26,9 +26,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <pthread.h>
-
-
 static char *tdesc = "TXTCIDName";
 
 static char *app = "TXTCIDName";
diff --git a/apps/app_url.c b/apps/app_url.c
index 6cae9eb9b..fdaa270ea 100755
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -21,7 +21,6 @@
 #include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Send URL Applications";
 
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 89527dfdf..e1a87c2a4 100755
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -19,7 +19,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Custom User Event Application";
 
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 803ea4c2a..e1d29430b 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -58,7 +58,6 @@ static inline int sql_init(void) { return 0; }
 static inline void sql_close(void) { }
 #endif
 
-#include <pthread.h>
 #include "../asterisk.h"
 #include "../astconf.h"
 
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index bb8622920..3bf8625b5 100755
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -18,14 +18,12 @@
 #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>
 #include <stdlib.h>
 
-#include <pthread.h>
-
-
 static char *synopsis = "Wait for Ring Application";
 
 static char *tdesc = "Waits until first ring after time";
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 497bd3a05..42777779c 100755
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -20,7 +20,6 @@
 #include <asterisk/translate.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
 static char *tdesc = "Block Telemarketers with Special Information Tone";
 
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 6d455ce4a..852d9ab1f 100755
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <pthread.h>
 
 #ifdef __linux__
 #include <linux/zaptel.h>
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index efe93f9fb..d835e12f8 100755
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 
-#include <pthread.h>
-
 /* Need some zaptel help here */
 #ifdef __linux__
 #include <linux/zaptel.h>
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index dab62711d..178cc511c 100755
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <pthread.h>
 
 #ifdef __linux__
 #include <linux/zaptel.h>