diff --git a/include/ma_pvio.h b/include/ma_pvio.h
index 7ac4be94..4d1a5a45 100644
--- a/include/ma_pvio.h
+++ b/include/ma_pvio.h
@@ -28,12 +28,6 @@ typedef struct st_ma_pvio_methods PVIO_METHODS;
 #define IS_MYSQL_ASYNC_ACTIVE(a) \
   (IS_MYSQL_ASYNC(a)&& (a)->options.extension->async_context->active)
 
-#ifndef ssl_defined
-#define ssl_defined
-struct st_ma_pvio_ssl;
-typedef struct st_ma_pvio_ssl MARIADB_SSL;
-#endif
-
 enum enum_pvio_timeout {
   PVIO_CONNECT_TIMEOUT= 0,
   PVIO_READ_TIMEOUT,
diff --git a/include/mysql.h b/include/mysql.h
index b6078699..f9d03294 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -222,16 +222,15 @@ extern unsigned int mariadb_deinitialize_ssl;
 
   enum mariadb_value {
     MARIADB_CHARSET_ID,
-    MARIADB_CHARSET_INFO,
     MARIADB_CHARSET_NAME,
     MARIADB_CLIENT_ERRORS,
     MARIADB_CLIENT_VERSION,
     MARIADB_CLIENT_VERSION_ID,
-    MARIADB_CONNECTION_ERROR,
-    MARIADB_CONNECTION_ERROR_ID,
-    MARIADB_CONNECTION_SQLSTATE,
     MARIADB_CONNECTION_ASYNC_TIMEOUT,
     MARIADB_CONNECTION_ASYNC_TIMEOUT_MS,
+    MARIADB_CONNECTION_CHARSET_INFO,
+    MARIADB_CONNECTION_ERROR,
+    MARIADB_CONNECTION_ERROR_ID,
     MARIADB_CONNECTION_HOST,
     MARIADB_CONNECTION_INFO,
     MARIADB_CONNECTION_PORT,
@@ -242,6 +241,7 @@ extern unsigned int mariadb_deinitialize_ssl;
     MARIADB_CONNECTION_SERVER_VERSION,
     MARIADB_CONNECTION_SERVER_VERSION_ID,
     MARIADB_CONNECTION_SOCKET,
+    MARIADB_CONNECTION_SQLSTATE,
     MARIADB_CONNECTION_SSL_CIPHER,
     MARIADB_CONNECTION_SSL_LIBRARY,
     MARIADB_CONNECTION_SSL_VERSION,
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index 1f4dac70..26767358 100644
--- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt
@@ -112,7 +112,7 @@ SET(EXPORT_SYMBOLS
  mysql_list_tables
  mysql_list_tables_cont
  mysql_list_tables_start
- mysql_load_plugin;
+ mysql_load_plugin
  mysql_load_plugin_v
  mysql_more_results
  mysql_next_result
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
index 9a960ab7..a5ec2869 100644
--- a/libmariadb/libmariadb.c
+++ b/libmariadb/libmariadb.c
@@ -2691,12 +2691,6 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
     mysql->options.reconnect= *(uint *)arg1;
     break;
   case MYSQL_OPT_PROTOCOL:
-#ifdef _WIN32
-    if (*(uint *)arg1 > MYSQL_PROTOCOL_PIPE)
-#else
-    if (*(uint *)arg1 > MYSQL_PROTOCOL_SOCKET)
-#endif
-      goto end;
     mysql->options.protocol= *(uint *)arg1;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
@@ -3682,7 +3676,7 @@ my_bool STDCALL mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *
     else
       goto error;
     break;
-  case MARIADB_CHARSET_INFO:
+  case MARIADB_CONNECTION_CHARSET_INFO:
     if (mysql)
       mariadb_get_charset_info(mysql, (MY_CHARSET_INFO *)arg);
     else
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index bb179128..dd156fe8 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1045,7 +1045,7 @@ static int test_get_info(MYSQL *mysql)
   rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval);
   FAIL_IF(rc, "mysql_get_info failed");
   diag("server_version_id: %d", sval);
-  rc= mariadb_get_infov(mysql, MARIADB_CHARSET_INFO, &cs);
+  rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_CHARSET_INFO, &cs);
   FAIL_IF(rc, "mysql_get_info failed");
   diag("charset name: %s", cs.csname);
   rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_PVIO_TYPE, &ival);