Index: funcs/func_strings.c
===================================================================
--- funcs/func_strings.c	(revision 67164)
+++ funcs/func_strings.c	(working copy)
@@ -191,7 +191,7 @@
 	AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->varshead, var, entries) {
 		if (strncasecmp(prefix, ast_var_name(var), len) == 0) {
 			AST_LIST_REMOVE_CURRENT(&chan->varshead, entries);
-			free(var);
+			ast_free(var);
 		}
 	}
 	AST_LIST_TRAVERSE_SAFE_END
Index: funcs/func_enum.c
===================================================================
--- funcs/func_enum.c	(revision 67164)
+++ funcs/func_enum.c	(working copy)
@@ -132,13 +132,13 @@
 	int k;
 
 	for (k = 0; k < data->context->naptr_rrs_count; k++) {
-		free(data->context->naptr_rrs[k].result);
-		free(data->context->naptr_rrs[k].tech);
+		ast_free(data->context->naptr_rrs[k].result);
+		ast_free(data->context->naptr_rrs[k].tech);
 	}
 
-	free(data->context->naptr_rrs);
-	free(data->context);
-	free(data);
+	ast_free(data->context->naptr_rrs);
+	ast_free(data->context);
+	ast_free(data);
 }
 
 static void erds_destroy_cb(void *data) 
@@ -191,7 +191,7 @@
 		goto finish;
 
 	if (!(erds->context = ast_calloc(1, sizeof(*erds->context)))) {
-		free(erds);
+		ast_free(erds);
 		goto finish;
 	}
 
@@ -200,8 +200,8 @@
 	snprintf(buf, len, "%u", erds->id);
 
 	if (!(datastore = ast_channel_datastore_alloc(&enum_result_datastore_info, buf))) {
-		free(erds->context);
-		free(erds);
+		ast_free(erds->context);
+		ast_free(erds);
 		goto finish;
 	}
 
Index: funcs/func_curl.c
===================================================================
--- funcs/func_curl.c	(revision 67164)
+++ funcs/func_curl.c	(working copy)
@@ -160,7 +160,7 @@
 				chunk.memory[chunk.size - 1] = '\0';
 
 			ast_copy_string(buf, chunk.memory, len);
-			free(chunk.memory);
+			ast_free(chunk.memory);
 		}
 	} else {
 		ast_log(LOG_ERROR, "Cannot allocate curl structure\n");
Index: funcs/func_odbc.c
===================================================================
--- funcs/func_odbc.c	(revision 67164)
+++ funcs/func_odbc.c	(working copy)
@@ -603,7 +603,7 @@
 		ast_copy_string((*query)->sql_read, tmp, sizeof((*query)->sql_read));
 
 	if (!ast_strlen_zero((*query)->sql_read) && ast_strlen_zero((*query)->readhandle[0])) {
-		free(*query);
+		ast_free(*query);
 		*query = NULL;
 		ast_log(LOG_ERROR, "There is SQL, but no ODBC class to be used for reading: %s\n", catg);
 		return EINVAL;
@@ -616,7 +616,7 @@
 		ast_copy_string((*query)->sql_write, tmp, sizeof((*query)->sql_write));
 
 	if (!ast_strlen_zero((*query)->sql_write) && ast_strlen_zero((*query)->writehandle[0])) {
-		free(*query);
+		ast_free(*query);
 		*query = NULL;
 		ast_log(LOG_ERROR, "There is SQL, but no ODBC class to be used for writing: %s\n", catg);
 		return EINVAL;
@@ -638,7 +638,7 @@
 
 	(*query)->acf = ast_calloc(1, sizeof(struct ast_custom_function));
 	if (! (*query)->acf) {
-		free(*query);
+		ast_free(*query);
 		*query = NULL;
 		return ENOMEM;
 	}
@@ -650,8 +650,8 @@
 	}
 
 	if (!((*query)->acf->name)) {
-		free((*query)->acf);
-		free(*query);
+		ast_free((*query)->acf);
+		ast_free(*query);
 		*query = NULL;
 		return ENOMEM;
 	}
@@ -659,9 +659,9 @@
 	asprintf((char **)&((*query)->acf->syntax), "%s(<arg1>[...[,<argN>]])", (*query)->acf->name);
 
 	if (!((*query)->acf->syntax)) {
-		free((char *)(*query)->acf->name);
-		free((*query)->acf);
-		free(*query);
+		ast_free((char *)(*query)->acf->name);
+		ast_free((*query)->acf);
+		ast_free(*query);
 		*query = NULL;
 		return ENOMEM;
 	}
@@ -691,19 +691,19 @@
 					"This function may only be set.\nSQL:\n%s\n",
 					(*query)->sql_write);
 	} else {
-		free((char *)(*query)->acf->syntax);
-		free((char *)(*query)->acf->name);
-		free((*query)->acf);
-		free(*query);
+		ast_free((char *)(*query)->acf->syntax);
+		ast_free((char *)(*query)->acf->name);
+		ast_free((*query)->acf);
+		ast_free(*query);
 		ast_log(LOG_WARNING, "Section %s was found, but there was no SQL to execute.  Ignoring.\n", catg);
 		return EINVAL;
 	}
 
 	if (! ((*query)->acf->desc)) {
-		free((char *)(*query)->acf->syntax);
-		free((char *)(*query)->acf->name);
-		free((*query)->acf);
-		free(*query);
+		ast_free((char *)(*query)->acf->syntax);
+		ast_free((char *)(*query)->acf->name);
+		ast_free((*query)->acf);
+		ast_free(*query);
 		*query = NULL;
 		return ENOMEM;
 	}
@@ -728,14 +728,14 @@
 	if (query) {
 		if (query->acf) {
 			if (query->acf->name)
-				free((char *)query->acf->name);
+				ast_free((char *)query->acf->name);
 			if (query->acf->syntax)
-				free((char *)query->acf->syntax);
+				ast_free((char *)query->acf->syntax);
 			if (query->acf->desc)
-				free((char *)query->acf->desc);
-			free(query->acf);
+				ast_free((char *)query->acf->desc);
+			ast_free(query->acf);
 		}
-		free(query);
+		ast_free(query);
 	}
 	return 0;
 }
Index: funcs/func_devstate.c
===================================================================
--- funcs/func_devstate.c	(revision 67164)
+++ funcs/func_devstate.c	(working copy)
@@ -187,7 +187,7 @@
 
 	AST_RWLIST_WRLOCK(&custom_devices);
 	while ((dev = AST_RWLIST_REMOVE_HEAD(&custom_devices, entry)))
-		free(dev);
+		ast_free(dev);
 	AST_RWLIST_UNLOCK(&custom_devices);
 
 	return res;
Index: funcs/func_callerid.c
===================================================================
--- funcs/func_callerid.c	(revision 67164)
+++ funcs/func_callerid.c	(working copy)
@@ -136,12 +136,12 @@
 	} else if (!strncasecmp("dnid", data, 4)) {
 		/* do we need to lock chan here? */
 		if (chan->cid.cid_dnid)
-			free(chan->cid.cid_dnid);
+			ast_free(chan->cid.cid_dnid);
 		chan->cid.cid_dnid = ast_strdup(value);
 	} else if (!strncasecmp("rdnis", data, 5)) {
 		/* do we need to lock chan here? */
 		if (chan->cid.cid_rdnis)
-			free(chan->cid.cid_rdnis);
+			ast_free(chan->cid.cid_rdnis);
 		chan->cid.cid_rdnis = ast_strdup(value);
 	} else if (!strncasecmp("pres", data, 4)) {
 		int i;