diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
index b533c9f67..6ddcd3988 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
@@ -19,6 +19,7 @@
 
 
 #include "Poco/Foundation.h"
+#include <mysql/mysql.h>
 
 
 //
@@ -54,7 +55,11 @@
 	#if !defined(MySQL_EXPORTS)
 		#pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX)
 	#endif
-	#pragma comment(lib, "libmysql")
+	#if defined(LIBMARIADB)
+		#pragma comment(lib, "libmariadb")
+	#else
+		#pragma comment(lib, "libmysql")
+	#endif
 #endif
 
 
diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
index c74ef5a00..bffdaae62 100644
--- a/Data/MySQL/src/MySQLException.cpp
+++ b/Data/MySQL/src/MySQLException.cpp
@@ -12,6 +12,11 @@
 //
 
 
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+
 #include "Poco/Data/MySQL/MySQLException.h"
 #include <mysql/mysql.h>
 #include <stdio.h>