compilation failures on Windows

plugin/type_mysql_json/type.cc

@@ -14,8 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
-#include <mysql/plugin_data_type.h>
 #include <my_global.h>
+#include <mysql/plugin_data_type.h>
 #include <sql_type.h>
 #include <field.h>
 #include <mysqld_error.h>

storage/example/ha_example.cc

@@ -98,7 +98,7 @@
 #pragma implementation        // gcc: Class implementation
 #endif
 
-#include <my_config.h>
+#include <my_global.h>
 #include <mysql/plugin.h>
 #include "ha_example.h"
 #include "sql_class.h"