diff --git a/deps/mysqlConnector/Connection.cpp b/deps/mysqlConnector/Connection.cpp
index 64c05554..9b317dc9 100644
--- a/deps/mysqlConnector/Connection.cpp
+++ b/deps/mysqlConnector/Connection.cpp
@@ -113,26 +113,26 @@ Mysql::Connection::~Connection()
 {
 }
 
-void Mysql::Connection::setOption( enum mysql_option option, const void *arg )
+void Mysql::Connection::setOption( enum mysqlOption option, const void *arg )
 {
 
-   if( mysql_options( m_pRawCon, option, arg ) != 0  )
+   if( mysql_options( m_pRawCon, static_cast< mysql_option>( option ), arg ) != 0  )
       throw std::runtime_error( "Connection::setOption failed!" );
 
 }
 
-void Mysql::Connection::setOption( enum mysql_option option, uint32_t arg )
+void Mysql::Connection::setOption( enum mysqlOption option, uint32_t arg )
 {
  
-   if( mysql_options( m_pRawCon, option, &arg ) != 0  )
+   if( mysql_options( m_pRawCon,  static_cast< mysql_option>( option ), &arg ) != 0  )
       throw std::runtime_error( "Connection::setOption failed!" );
 
 }
 
-void Mysql::Connection::setOption( enum mysql_option option, const std::string& arg )
+void Mysql::Connection::setOption( enum mysqlOption option, const std::string& arg )
 {
 
-   if( mysql_options( m_pRawCon, option, arg.c_str() ) != 0 )
+   if( mysql_options( m_pRawCon,  static_cast< mysql_option>( option ), arg.c_str() ) != 0 )
       throw std::runtime_error( "Connection::setOption failed!" );
 
 }
diff --git a/deps/mysqlConnector/Connection.h b/deps/mysqlConnector/Connection.h
index bcffc71a..1283ead5 100644
--- a/deps/mysqlConnector/Connection.h
+++ b/deps/mysqlConnector/Connection.h
@@ -3,13 +3,13 @@
 
 #include <memory>
 #include <map>
+#include "MysqlCommon.h"
 
 typedef struct st_mysql MYSQL;
-enum mysql_option;
 
 namespace Mysql
 {
-   using optionMap = std::map< enum mysql_option, std::string >;
+   using optionMap = std::map< enum mysqlOption, std::string >;
    class MySqlBase;
    class Statement;
    class PreparedStatement;
@@ -37,9 +37,9 @@ namespace Mysql
 
       bool ping();
       
-      void setOption( enum mysql_option option, const void* arg );
-      void setOption( enum mysql_option option, uint32_t arg );
-      void setOption( enum mysql_option option, const std::string& arg );
+      void setOption( enum mysqlOption option, const void* arg );
+      void setOption( enum mysqlOption option, uint32_t arg );
+      void setOption( enum mysqlOption option, const std::string& arg );
 
       std::shared_ptr< MySqlBase > getMySqlBase() const;
 
diff --git a/deps/mysqlConnector/MySqlBase.h b/deps/mysqlConnector/MySqlBase.h
index c44c9284..43a2b38e 100644
--- a/deps/mysqlConnector/MySqlBase.h
+++ b/deps/mysqlConnector/MySqlBase.h
@@ -4,13 +4,13 @@
 #include <memory>
 #include <string>
 #include <map>
+#include "MysqlCommon.h"
 
-enum mysql_option;
 
 namespace Mysql
 {
 
-using optionMap = std::map< enum ::mysql_option, std::string >;
+using optionMap = std::map< enum mysqlOption, std::string >;
 
 class Connection;
 
diff --git a/deps/mysqlConnector/MysqlCommon.h b/deps/mysqlConnector/MysqlCommon.h
new file mode 100644
index 00000000..0efd8287
--- /dev/null
+++ b/deps/mysqlConnector/MysqlCommon.h
@@ -0,0 +1,33 @@
+#ifndef MYSQL_COMMON_H
+#define MYSQL_COMMON_H
+
+namespace Mysql {
+enum mysqlOption 
+{
+  MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
+  MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
+  MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
+  MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT,
+  MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT,
+  MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
+  MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
+  MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
+  MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
+  MYSQL_OPT_BIND,
+  MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, 
+  MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER,
+  MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH,
+  MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD,
+  MYSQL_OPT_CONNECT_ATTR_DELETE,
+  MYSQL_SERVER_PUBLIC_KEY,
+  MYSQL_ENABLE_CLEARTEXT_PLUGIN,
+  MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
+  MYSQL_OPT_SSL_ENFORCE,
+  MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
+  MYSQL_OPT_TLS_VERSION,
+  MYSQL_OPT_SSL_MODE
+};
+
+}
+
+#endif
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index aef19f6c..0e6d5101 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -5,7 +5,6 @@
 
 #include "PreparedStatement.h"
 #include "Framework.h"
-#include <mysql.h>
 
 extern Core::Framework g_fw;
 
@@ -55,8 +54,8 @@ uint32_t Core::Db::DbConnection::open()
 {
   std::shared_ptr< Mysql::MySqlBase > base( new Mysql::MySqlBase() );
   Mysql::optionMap options;
-  options[ MYSQL_OPT_RECONNECT ] = "1";
-  options[ MYSQL_SET_CHARSET_NAME ] = "utf8";
+  options[ Mysql::mysqlOption::MYSQL_OPT_RECONNECT ] = "1";
+  options[ Mysql::mysqlOption::MYSQL_SET_CHARSET_NAME ] = "utf8";
 
   try
   {