diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index dafbdd57c0ae1a89421153c43ff38525403e4771..1720261a86580337da3bab8f313476c8fa8be30c 100755
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -11,6 +11,7 @@
  * the GNU General Public License
  */
 
+#include <sys/types.h>
 #include <asterisk/channel.h>
 #include <asterisk/module.h>
 #include <asterisk/pbx.h>
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index 797eb041db599fb4d4e5e221d6179cfb305a3164..10f7914316ae49552eba45b6d10989a2a5ddb82b 100755
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -28,6 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 #include <asterisk/file.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
@@ -37,7 +38,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <dirent.h>
 
 #include <pthread.h>
@@ -70,7 +70,7 @@ static int hasnewvoicemail_exec(struct ast_channel *chan, void *data)
 	}
 	LOCAL_USER_ADD(u);
 
-	input = strdupa((char *)data);
+	input = ast_strdupa((char *)data);
 	if (input) {
 		if ((vmbox = strsep(&input,"|")))
 			varname = input;
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index fb37ea65d5bd6bd0e97ae36e645b765c3ad091f6..dd22167027d0cef19021c0efff50578adff36e62 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5308,7 +5308,7 @@ static struct ast_channel *zt_request(char *type, int format, void *data)
 		return NULL;
 	}
 	if (data) {
-		dest = strdupa((char *)data);
+		dest = ast_strdupa((char *)data);
 	} else {
 		ast_log(LOG_WARNING, "Channel requested with no data\n");
 		return NULL;
diff --git a/channels/chan_zap_old.c b/channels/chan_zap_old.c
index cd3c4a5478a60d58d1726f710e6d71c1a3796b6a..0689d15985b80da22381f2181db68546badaa894 100755
--- a/channels/chan_zap_old.c
+++ b/channels/chan_zap_old.c
@@ -5189,7 +5189,7 @@ static struct ast_channel *zt_request(char *type, int format, void *data)
 		return NULL;
 	}
 	if (data) {
-		dest = strdupa((char *)data);
+		dest = ast_strdupa((char *)data);
 	} else {
 		ast_log(LOG_WARNING, "Channel requested with no data\n");
 		return NULL;