--- a/ext/mysqli/php_mysqli_structs.h	2020-05-15 10:51:15.646153296 +0000
+++ b/ext/mysqli/php_mysqli_structs.h	2020-05-15 10:51:31.866256539 +0000
@@ -77,10 +77,10 @@
 #include <my_sys.h>
 #include <mysql.h>
 #include <errmsg.h>
-#include <my_list.h>
-#include <m_string.h>
+#include <server/my_list.h>
+#include <server/m_string.h>
 #include <mysqld_error.h>
-#include <my_list.h>
+#include <server/my_list.h>
 #include <m_ctype.h>
 #include "mysqli_libmysql.h"
 #endif /* MYSQLI_USE_MYSQLND */
--- a/ext/mysql/php_mysql.c	2020-05-14 11:38:45.532581490 +0000
+++ b/ext/mysql/php_mysql.c	2020-05-14 11:44:46.168742339 +0000
@@ -68,6 +68,10 @@
 #include "php_ini.h"
 #include "php_mysql_structs.h"
 
+#if defined MARIADB_PORT && !defined MYSQL_PORT
+#define MYSQL_PORT MARIADB_PORT
+#endif
+
 /* True globals, no need for thread safety */
 static int le_result, le_link, le_plink;