diff --git a/Data/MySQL/MySQL.make b/Data/MySQL/MySQL.make
index acf97243f..878c1fbd7 100644
--- a/Data/MySQL/MySQL.make
+++ b/Data/MySQL/MySQL.make
@@ -1,40 +1,61 @@
 #
 # MySQL.make
 #
-# Makefile fragment for finding MySQL library
+# Makefile fragment for finding MySQL headers and library
 #
 
-ifndef POCO_MYSQL_INCLUDE
-ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
-POCO_MYSQL_INCLUDE = /usr/local/include
+ifeq ($(OSNAME),Darwin)
+  POCO_MYSQL_CONFIG = $(shell whereis -bq mysql_config)
 else
-ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?))
-POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/include
-else
-ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/include; echo $$?))
-POCO_MYSQL_INCLUDE = /opt/homebrew/opt/mysql-client/include
-endif
-endif
-endif
+  ifeq ($(OSNAME),Linux)
+    POCO_MYSQL_CONFIG = $(shell which mysql_config)
+  endif
 endif
 
-ifndef POCO_MYSQL_LIB
-ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
-POCO_MYSQL_LIB = /usr/local/lib
+ifneq (, $(POCO_MYSQL_CONFIG))
+  ifndef POCO_MYSQL_INCLUDE
+    POCO_MYSQL_INCLUDE = $(shell mysql_config --include)
+  endif
+  ifndef POCO_MYSQL_LIB
+    POCO_MYSQL_LIB = $(shell mysql_config --libs)
+  endif
 else
-ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
-POCO_MYSQL_LIB = /usr/local/opt/mysql-client/lib
-else
-ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/lib; echo $$?))
-POCO_MYSQL_LIB = /opt/homebrew/opt/mysql-client/lib
-endif
-endif
-endif
+  ifndef POCO_MYSQL_INCLUDE
+    ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+      POCO_MYSQL_INCLUDE = -I/usr/local/include
+    else
+      ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include/mysql; echo $$?))
+        POCO_MYSQL_INCLUDE = -I/usr/local/opt/mysql-client/include/mysql
+      else
+        ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?))
+          POCO_MYSQL_INCLUDE = -I/usr/local/opt/mysql-client/include
+        else
+          ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/include; echo $$?))
+            POCO_MYSQL_INCLUDE = -I/opt/homebrew/opt/mysql-client/include
+          endif
+        endif
+      endif
+    endif
+  endif
+
+  ifndef POCO_MYSQL_LIB
+    ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+      POCO_MYSQL_LIB = -L/usr/local/lib
+    else
+      ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
+        POCO_MYSQL_LIB = -L/usr/local/opt/mysql-client/lib
+      else
+        ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/lib; echo $$?))
+          POCO_MYSQL_LIB = -L/opt/homebrew/opt/mysql-client/lib
+        endif
+      endif
+    endif
+  endif
 endif
 
 ifdef POCO_MYSQL_INCLUDE
-INCLUDE += -I$(POCO_MYSQL_INCLUDE)
+  INCLUDE += $(POCO_MYSQL_INCLUDE)
 endif
 ifdef POCO_MYSQL_LIB
-SYSLIBS += -L$(POCO_MYSQL_LIB)
+  SYSLIBS += $(POCO_MYSQL_LIB)
 endif
diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
index 57f6cc9e1..a66b83577 100644
--- a/Data/MySQL/src/MySQLException.cpp
+++ b/Data/MySQL/src/MySQLException.cpp
@@ -19,7 +19,6 @@
 
 #include "Poco/Data/MySQL/MySQLException.h"
 #include "Poco/NumberFormatter.h"
-#include <mysql/mysql.h>
 
 
 namespace Poco {