diff --git a/include/ma_global.h b/include/ma_global.h
index 6d1c6f65a..59fc38898 100644
--- a/include/ma_global.h
+++ b/include/ma_global.h
@@ -34,9 +34,9 @@
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
-#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
 #endif
-#define STDCALL __stdcall 
+#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
+#define STDCALL __stdcall
 #endif
 
 #include <ma_config.h>
diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in
index 6e0433b3a..6d59aef2c 100644
--- a/libmariadb/ma_client_plugin.c.in
+++ b/libmariadb/ma_client_plugin.c.in
@@ -351,7 +351,7 @@ mysql_client_register_plugin(MYSQL *mysql,
 
 /* see <mysql/client_plugin.h> for a full description */
 struct st_mysql_client_plugin * STDCALL
-mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
+mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
                     int argc, va_list args)
 {
   const char *errmsg;
@@ -467,8 +467,8 @@ err:
 
 
 /* see <mysql/client_plugin.h> for a full description */
-struct st_mysql_client_plugin * STDCALL
-mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
+struct st_mysql_client_plugin *
+mysql_load_plugin(struct st_mysql *mysql, const char *name, int type, int argc, ...)
 {
   struct st_mysql_client_plugin *p;
   va_list args;