diff --git a/uppsrc/MySql/MySql.h b/uppsrc/MySql/MySql.h
index d31c4c92e..902417d77 100644
--- a/uppsrc/MySql/MySql.h
+++ b/uppsrc/MySql/MySql.h
@@ -11,16 +11,9 @@
 #ifndef IPPROTO_IP
 #include <winsock2.h>
 #endif
-#include <mysql.h>
 #endif
 
-#ifdef PLATFORM_POSIX
-#ifdef PLATFORM_OSX
 #include <mysql.h>
-#else
-#include <mysql/mysql.h>
-#endif
-#endif
 
 namespace Upp {
 
diff --git a/uppsrc/MySql/MySql.upp b/uppsrc/MySql/MySql.upp
index bfd8b62a8..514268a22 100644
--- a/uppsrc/MySql/MySql.upp
+++ b/uppsrc/MySql/MySql.upp
@@ -10,19 +10,9 @@ uses
 
 library(WIN32) libmysql.lib;
 
-library(LINUX !MT) "mysqlclient ssl";
-
-library(LINUX MT) "mysqlclient_r ssl";
-
-library(FREEBSD) mysqlclient;
-
 library(OSX) mysqlclient;
 
-link(DEBUG SO) /nodefaultlib:LIBCD;
-
-link(SHARED SO) /nodefaultlib:LIBCMT;
-
-link(FREEBSD) -L/usr/local/lib/mysql;
+pkg_config(LINUX | FREEBSD | OPENBSD) mysqlclient;
 
 file
 	MySql.h,
diff --git a/uppsrc/PostgreSQL/PostgreSQL.upp b/uppsrc/PostgreSQL/PostgreSQL.upp
index 2a5559a02..0170ebdb9 100644
--- a/uppsrc/PostgreSQL/PostgreSQL.upp
+++ b/uppsrc/PostgreSQL/PostgreSQL.upp
@@ -6,7 +6,7 @@ uses
 
 library(WIN32) libpq.lib;
 
-library(POSIX) pq;
+pkg_config(LINUX | FREEBSD | OPENBSD) libpq;
 
 file
 	PostgreSQL.h,