diff --git a/ma_conv_charset.h b/ma_conv_charset.h
index f30d286..29ea7db 100644
--- a/ma_conv_charset.h
+++ b/ma_conv_charset.h
@@ -23,7 +23,7 @@
 #ifndef _MA_CONV_CHARSET_H_
 #define _MA_CONV_CHARSET_H_
 
-#include "mariadb_ctype.h"
+#include <mysql/mariadb_ctype.h>
 
 size_t MADB_ConvertString(const char *from __attribute__((unused)),
                           size_t *from_len __attribute__((unused)),
diff --git a/ma_odbc.h b/ma_odbc.h
index 15a1789..d32cd40 100644
--- a/ma_odbc.h
+++ b/ma_odbc.h
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 #include <ma_legacy_helpers.h>
 
@@ -37,7 +37,7 @@
 #include <sqlext.h>
 #include <odbcinst.h>
 
-#include <errmsg.h>
+#include <mysql/errmsg.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>