diff --git a/include/m_ctype.h b/include/m_ctype.h
index ff187369..597eb985 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -65,4 +65,9 @@ char* madb_get_os_character_set(void);
 #ifdef _WIN32
 int madb_get_windows_cp(const char *charset);
 #endif
+
+#ifdef	__cplusplus
+}
+#endif
+
 #endif
diff --git a/include/mysql.h b/include/mysql.h
index 7b3d95fc..78d79546 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -49,6 +49,7 @@ typedef int my_socket;
 #endif
 #endif
 #endif
+#include "my_global.h"
 #include "mysql_com.h"
 #include "mysql_version.h"
 #include "my_list.h"