diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index f7adb2290e..042e893be5 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1029,11 +1029,11 @@ typedef switch_status_t (*switch_module_runtime_t) (void);
 typedef switch_status_t (*switch_module_shutdown_t) (void);
 typedef struct switch_xml *switch_xml_t;
 typedef struct switch_core_time_duration switch_core_time_duration_t;
-typedef switch_xml_t (*switch_xml_search_function_t)(char *section,
-													 char *tag_name,
-													 char *key_name,
-													 char *key_value,
-													 char *params,
+typedef switch_xml_t (*switch_xml_search_function_t)(const char *section,
+													 const char *tag_name,
+													 const char *key_name,
+													 const char *key_value,
+													 const char *params,
                                                      void *user_data);
 
 /* things we don't deserve to know about */
diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index a79a54db9a..a36c0d7fa4 100644
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -316,20 +316,20 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void);
 ///\param node a pointer to the requested node
 ///\param params optional URL formatted params to pass to external gateways
 ///\return SWITCH_STATUS_SUCCESS if successful root and node will be assigned
-SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section,
-												  char *tag_name,
-												  char *key_name,
-												  char *key_value,
+SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
+												  const char *tag_name,
+												  const char *key_name,
+												  const char *key_value,
 												  switch_xml_t *root,
 												  switch_xml_t *node,
-												  char *params);
+												  const char *params);
 												 
 ///\brief open a config in the core registry
 ///\param file_path the name of the config section e.g. modules.conf
 ///\param node a pointer to point to the node if it is found
 ///\param params optional URL formatted params to pass to external gateways
 ///\return the root xml node associated with the current request or NULL
-SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params);
+SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params);
 
 ///\brief bind a search function to an external gateway
 ///\param function the search function to bind
@@ -342,7 +342,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_searc
 ///\brief parse a string for a list of sections
 ///\param str a | delimited list of section names
 ///\return the section mask
-SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str);
+SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str);
 
 SWITCH_END_EXTERN_C
 
diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
index b9d51af56f..0aedfb5f00 100644
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -56,11 +56,11 @@ static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
 }
 
 
-static switch_xml_t xml_url_fetch(char *section,
-								  char *tag_name,
-								  char *key_name,
-								  char *key_value,
-								  char *params,
+static switch_xml_t xml_url_fetch(const char *section,
+								  const char *tag_name,
+								  const char *key_name,
+								  const char *key_value,
+								  const char *params,
                                   void *user_data)
 {
 	char filename[512] = "";
diff --git a/src/switch_xml.c b/src/switch_xml.c
index a5a70c373d..f3f4d0e3c5 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -112,7 +112,7 @@ static struct xml_section_t SECTIONS[] = {
 	{ NULL, 0}
 };
 
-SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str)
+SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str)
 {
 	size_t x;
 	char buf[1024] = "";
@@ -950,12 +950,12 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
     int fd = -1, write_fd = -1;
     switch_xml_t xml = NULL;
     char *new_file = NULL;
-    char *abs;
+    const char *abs;
 
     if ((abs = strrchr(file, '/')) || (abs = strrchr(file, '\\'))) {
         abs++;
     } else {
-        abs = (char *)file;
+        abs = file;
     }
     
     if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) {
@@ -991,13 +991,13 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
 }
 
 
-SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section,
-												  char *tag_name,
-												  char *key_name,
-												  char *key_value,
+SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
+												  const char *tag_name,
+												  const char *key_name,
+												  const char *key_value,
 												  switch_xml_t *root,
 												  switch_xml_t *node,
-												  char *params)
+												  const char *params)
 {
 	switch_xml_t conf = NULL;
 	switch_xml_t tag = NULL;
@@ -1154,7 +1154,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void)
 	return SWITCH_STATUS_FALSE;
 }
 
-SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params)
+SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params)
 {
 	switch_xml_t xml = NULL, cfg = NULL;