diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 7ff9015f2c..770188fbaa 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 483ab216b2..611330f09d 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 9e3284bd7c..d2783ca108 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 8df1fee0e8..c20bd02565 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 ec883abf47..85de1fa87f 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 1e38d49dad..c874b5a84f 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 d71139e134..cbd1eaaa09 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,