Index: main/loader.c
===================================================================
--- main/loader.c	(revision 69258)
+++ main/loader.c	(working copy)
@@ -526,7 +526,7 @@
 		if (!strncasecmp(word, cur->resource, l) &&
 		    (cur->info->reload || !needsreload) &&
 		    ++which > state) {
-			ret = strdup(cur->resource);
+			ret = ast_strdup(cur->resource);
 			break;
 		}
 	}
@@ -535,7 +535,7 @@
 	if (!ret) {
 		for (i=0; !ret && reload_classes[i].name; i++) {
 			if (!strncasecmp(word, reload_classes[i].name, l) && ++which > state)
-				ret = strdup(reload_classes[i].name);
+				ret = ast_strdup(reload_classes[i].name);
 		}
 	}
 
Index: main/channel.c
===================================================================
--- main/channel.c	(revision 69258)
+++ main/channel.c	(working copy)
@@ -295,7 +295,7 @@
 
 	AST_LIST_TRAVERSE(&backends, cl, list) {
 		if (!strncasecmp(word, cl->tech->type, wordlen) && ++which > state) {
-			ret = strdup(cl->tech->type);
+			ret = ast_strdup(cl->tech->type);
 			break;
 		}
 	}
Index: main/http.c
===================================================================
--- main/http.c	(revision 69258)
+++ main/http.c	(working copy)
@@ -215,12 +215,12 @@
 
 out404:
 	*status = 404;
-	*title = strdup("Not Found");
+	*title = ast_strdup("Not Found");
 	return ast_http_error(404, "Not Found", NULL, "Nothing to see here.  Move along.");
 
 out403:
 	*status = 403;
-	*title = strdup("Access Denied");
+	*title = ast_strdup("Access Denied");
 	return ast_http_error(403, "Access Denied", NULL, "Sorry, I cannot let you do that, Dave.");
 }
 
@@ -616,7 +616,7 @@
 			out = ast_http_error(302, "Moved Temporarily", buf,
 				"There is no spoon...");
 			*status = 302;
-			*title = strdup("Moved Temporarily");
+			*title = ast_strdup("Moved Temporarily");
 			break;
 		}
 	}
@@ -655,7 +655,7 @@
 		out = ast_http_error(404, "Not Found", NULL,
 			"The requested URL was not found on this server.");
 		*status = 404;
-		*title = strdup("Not Found");
+		*title = ast_strdup("Not Found");
 	}
 
 cleanup:
Index: main/asterisk.c
===================================================================
--- main/asterisk.c	(revision 69258)
+++ main/asterisk.c	(working copy)
@@ -1981,7 +1981,7 @@
 			}
 		}
 
-		match_list[matches++] = strdup(retstr);
+		match_list[matches++] = ast_strdup(retstr);
 	}
 
 	if (!match_list)
Index: main/enum.c
===================================================================
--- main/enum.c	(revision 69258)
+++ main/enum.c	(working copy)
@@ -346,8 +346,8 @@
 			if ((p = ast_realloc(c->naptr_rrs, sizeof(*c->naptr_rrs) * (c->naptr_rrs_count + 1)))) {
 				c->naptr_rrs = p;
 				memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(c->naptr_rrs->naptr));
-				c->naptr_rrs[c->naptr_rrs_count].result = strdup(c->dst);
-				c->naptr_rrs[c->naptr_rrs_count].tech = strdup(c->tech);
+				c->naptr_rrs[c->naptr_rrs_count].result = ast_strdup(c->dst);
+				c->naptr_rrs[c->naptr_rrs_count].tech = ast_strdup(c->tech);
 				c->naptr_rrs[c->naptr_rrs_count].sort_pos = c->naptr_rrs_count;
 				c->naptr_rrs_count++;
 			}
Index: main/cli.c
===================================================================
--- main/cli.c	(revision 69258)
+++ main/cli.c	(working copy)
@@ -105,7 +105,7 @@
 	if (c && word[0] != '/')
 		c += (strlen(ast_config_AST_MODULE_DIR) + 1);
 	
-	return c ? strdup(c) : c;
+	return c ? ast_strdup(c) : c;
 }
 
 static char *handle_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -693,7 +693,7 @@
 		/* XXX remember to handle the optional "off" */
 		if (a->pos != e->args)
 			return NULL;
-		return a->n == 0 ? strdup("all") : ast_complete_channels(a->line, a->word, a->pos, a->n - 1, e->args);
+		return a->n == 0 ? ast_strdup("all") : ast_complete_channels(a->line, a->word, a->pos, a->n - 1, e->args);
 	}
 	/* 'core set debug channel {all|chan_id}' */
 	if (a->argc == e->args + 2) {
@@ -1027,7 +1027,7 @@
 	char buf[80];
 
 	ast_join(buf, sizeof(buf), e->cmda);
-	e->_full_cmd = strdup(buf);
+	e->_full_cmd = ast_strdup(buf);
 	if (!e->_full_cmd) {
 		ast_log(LOG_WARNING, "-- cannot allocate <%s>\n", buf);
 		return -1;
@@ -1144,7 +1144,7 @@
 		if (strncasecmp(token, word, lw))	/* no match */
 			return NULL;
 		*actual = 1;
-		return (pos != 0) ? NULL : strdup(token);
+		return (pos != 0) ? NULL : ast_strdup(token);
 	}
 	/* now handle regexp match */
 
@@ -1158,7 +1158,7 @@
 			continue;
 		(*actual)++;
 		if (pos-- == 0)
-			return strdup(s);
+			return ast_strdup(s);
 	}
 	return NULL;
 }
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 69258)
+++ main/pbx.c	(working copy)
@@ -1360,7 +1360,7 @@
 	AST_RWLIST_RDLOCK(&acf_root);
 	AST_RWLIST_TRAVERSE(&acf_root, acf, acflist) {
  		if (!strncasecmp(word, acf->name, wordlen) && ++which > state) {
- 			ret = strdup(acf->name);
+ 			ret = ast_strdup(acf->name);
 			break;
 		}
 	}
@@ -3066,7 +3066,7 @@
 	AST_RWLIST_RDLOCK(&apps);
 	AST_RWLIST_TRAVERSE(&apps, a, list) {
 		if (!strncasecmp(word, a->name, wordlen) && ++which > state) {
-			ret = strdup(a->name);
+			ret = ast_strdup(a->name);
 			break;
 		}
 	}
Index: main/file.c
===================================================================
--- main/file.c	(revision 69258)
+++ main/file.c	(working copy)
@@ -841,7 +841,7 @@
 		fs->fmt = f;
 		fs->flags = flags;
 		fs->mode = mode;
-		fs->filename = strdup(filename);
+		fs->filename = ast_strdup(filename);
 		fs->vfs = NULL;
 		break;
 	}
@@ -952,11 +952,11 @@
 			fs->flags = flags;
 			fs->mode = mode;
 			if (orig_fn) {
-				fs->realfilename = strdup(orig_fn);
-				fs->filename = strdup(fn);
+				fs->realfilename = ast_strdup(orig_fn);
+				fs->filename = ast_strdup(fn);
 			} else {
 				fs->realfilename = NULL;
-				fs->filename = strdup(filename);
+				fs->filename = ast_strdup(filename);
 			}
 			fs->vfs = NULL;
 			/* If truncated, we'll be at the beginning; if not truncated, then append */