diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41f87aa..5d80854 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ set(TEST_LIBRARIES
         tomcrypt::static
         tommath::static
 
-        mysqlclient::static
+        mysqlclient.a
         jsoncpp_lib
         ${ed25519_LIBRARIES_STATIC}
         ${DataPipes_LIBRARIES_SHARED} # Also includes glib2.0
diff --git a/src/sql/mysql/MySQL.h b/src/sql/mysql/MySQL.h
index 3e06893..d3071ce 100644
--- a/src/sql/mysql/MySQL.h
+++ b/src/sql/mysql/MySQL.h
@@ -7,7 +7,14 @@
 #include "sql/SqlQuery.h"
 
 #include "../../misc/spin_lock.h"
-#include <mysql.h>
+
+#if defined(HAVE_MYSQL_MYSQL_H)
+    #include <mysql/mysql.h>
+#elif defined(HAVE_MYSQL_H)
+    #include <mysql.h>
+#else
+    typedef void MYSQL;
+#endif
 
 #define ERROR_MYSQL_MISSING_DRIVER    -1
 #define ERROR_MYSQL_INVLID_CONNECT    -2