diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 7ff9015f2c19e060aa39ec14697e0dec839e5736..770188fbaa07eaa2eed45de28ce52e9a6f744eec 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1758,7 +1758,7 @@ static char *realtime_ldap_status(struct ast_cli_entry *e, int cmd, struct ast_c
 	return CLI_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "LDAP realtime interface",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LDAP realtime interface",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 483ab216b23a39ed283af34baecabe5d872fa8b4..611330f09d8d691c7079bf54fda22fb96fb631b6 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -1862,7 +1862,7 @@ static int load_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Realtime SQLite configuration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Realtime SQLite configuration",
 		.load = load_module,
 		.unload = unload_module,
 );
diff --git a/res/res_curl.c b/res/res_curl.c
index 9e3284bd7c4b099f8b07123f8e66bfa981300cdd..d2783ca108d790174a8b04cc371c3c4434a4be83 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -71,5 +71,3 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "cURL Resource Module");
-
-
diff --git a/res/res_jabber.exports b/res/res_jabber.exports
index 8df1fee0e899569b4aecf64e7cc335caf7f63772..c20bd02565dad26045ebac0b2a61ef792c588907 100644
--- a/res/res_jabber.exports
+++ b/res/res_jabber.exports
@@ -8,6 +8,7 @@
 		ast_aji_invite_chat;
 		ast_aji_join_chat;
 		ast_aji_send;
+		ast_aji_send_chat;
 	local:
 		*;
 };
diff --git a/res/res_odbc.c b/res/res_odbc.c
index ec883abf4713f872696a6214bdac8f50e56afea9..85de1fa87f9c71bf3e630c30caeff57d599020a6 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -133,7 +133,7 @@ struct odbc_class
 	struct ao2_container *obj_container;
 };
 
-struct ao2_container *class_container;
+static struct ao2_container *class_container;
 
 static AST_RWLIST_HEAD_STATIC(odbc_tables, odbc_cache_tables);
 
diff --git a/res/res_odbc.exports b/res/res_odbc.exports
index 1e38d49dad8c189783acaaa0d17c9d1475446768..c874b5a84f5ff342f61fb3462c0cff83f424d10b 100644
--- a/res/res_odbc.exports
+++ b/res/res_odbc.exports
@@ -1,9 +1,16 @@
 {
 	global:
+		ast_odbc_ast_str_SQLGetData;
 		ast_odbc_backslash_is_escape;
+		ast_odbc_clear_cache;
+		ast_odbc_direct_execute;
+		ast_odbc_find_column;
+		ast_odbc_find_table;
 		ast_odbc_prepare_and_execute;
 		ast_odbc_release_obj;
 		ast_odbc_request_obj;
+		ast_odbc_request_obj2;
+		ast_odbc_retrieve_transaction_obj;
 		ast_odbc_sanity_check;
 		ast_odbc_smart_execute;
 	local:
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index d71139e134d1f76604c0d5b362d40332f858a6e7..cbd1eaaa09f4bace1fa3a0cee6d6aa7227d767b7 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -1305,7 +1305,7 @@ static int reload(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "HTTP Phone Provisioning",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP Phone Provisioning",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,