diff --git a/include/mysql.h b/include/mysql.h
index ef5428bc..a80b840c 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -570,7 +570,7 @@ unsigned long STDCALL mysql_hex_string(char *to, const char *from, size_t len);
 my_socket STDCALL mysql_get_socket(MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
-my_bool STDCALL mysql_reconnect(MYSQL *mysql);
+my_bool STDCALL mariadb_reconnect(MYSQL *mysql);
 
 /* Async API */
 int STDCALL mysql_close_start(MYSQL *sock);
@@ -768,7 +768,7 @@ struct st_mariadb_api {
   my_socket (STDCALL *mysql_get_socket)(MYSQL *mysql);
   unsigned int (STDCALL *mysql_get_timeout_value)(const MYSQL *mysql);
   unsigned int (STDCALL *mysql_get_timeout_value_ms)(const MYSQL *mysql);
-  my_bool (STDCALL *mysql_reconnect)(MYSQL *mysql);
+  my_bool (STDCALL *mariadb_reconnect)(MYSQL *mysql);
   MYSQL_STMT * (STDCALL *mysql_stmt_init)(MYSQL *mysql);
   int (STDCALL *mysql_stmt_prepare)(MYSQL_STMT *stmt, const char *query, size_t length);
   int (STDCALL *mysql_stmt_execute)(MYSQL_STMT *stmt);
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 98e38fa1..6ae96993 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -149,7 +149,7 @@ struct st_mariadb_methods MARIADB_DEFAULT_METHODS;
 static void end_server(MYSQL *mysql);
 static void mysql_close_memory(MYSQL *mysql);
 void read_user_name(char *name);
-my_bool STDCALL mysql_reconnect(MYSQL *mysql);
+my_bool STDCALL mariadb_reconnect(MYSQL *mysql);
 static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length);
 
 extern int mysql_client_plugin_init();
@@ -381,7 +381,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
 
   if (mysql->net.pvio == 0)
   {						/* Do reconnect if possible */
-    if (mysql_reconnect(mysql))
+    if (mariadb_reconnect(mysql))
     {
       return(1);
     }
@@ -417,7 +417,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
       goto end;
     }
     end_server(mysql);
-    if (mysql_reconnect(mysql))
+    if (mariadb_reconnect(mysql))
       goto end;
     if (ma_net_write_command(net,(uchar) command,arg,
 			  length ? length : (ulong) strlen(arg)))
@@ -1549,7 +1549,7 @@ my_suspend_hook(my_bool suspend, void *data)
 }
 #endif
 
-my_bool STDCALL mysql_reconnect(MYSQL *mysql)
+my_bool STDCALL mariadb_reconnect(MYSQL *mysql)
 {
   MYSQL tmp_mysql;
 #ifdef HAVE_NONBLOCK
@@ -3767,7 +3767,7 @@ struct st_mariadb_api MARIADB_API=
   mysql_get_socket,
   mysql_get_timeout_value,
   mysql_get_timeout_value_ms,
-  mysql_reconnect,
+  mariadb_reconnect,
   mysql_stmt_init,
   mysql_stmt_prepare,
   mysql_stmt_execute,
diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
index d5cece6c..4ce7a94f 100644
--- a/mariadb_config/mariadb_config.c.in
+++ b/mariadb_config/mariadb_config.c.in
@@ -2,6 +2,7 @@
 #include <ma_sys.h>
 #include <getopt.h>
 #include <stdio.h>
+#include <mariadb_version.h>
 
 static char *mariadb_progname;