diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h
index eb1a6b0e629..be21af73481 100644
--- a/include/mysql/service_encryption.h
+++ b/include/mysql/service_encryption.h
@@ -31,7 +31,9 @@ extern "C" {
 #ifndef MYSQL_ABI_CHECK
 #ifdef _WIN32
 #include <malloc.h>
+#ifndef __cplusplus
 #define inline __inline
+#endif
 #else
 #include <alloca.h>
 #endif
diff --git a/sql/sql_class.h b/sql/sql_class.h
index f12281657f5..d2bd0acea7a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2630,6 +2630,7 @@ public:
   ulong      query_plan_fsort_passes; 
   pthread_t  real_id;                           /* For debugging */
   my_thread_id  thread_id;
+	typedef ulong pid_t;
   pid_t      os_thread_id;
   uint	     tmp_table, global_disable_checkpoint;
   uint	     server_status,open_options;
diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h
index f9892109bc5..0903b789fb6 100644
--- a/storage/connect/jsonudf.h
+++ b/storage/connect/jsonudf.h
@@ -85,14 +85,14 @@ extern "C" {
 	DllExport void json_object_grp_clear(UDF_INIT *, char *, char *);
 	DllExport void json_object_grp_deinit(UDF_INIT*);
 
-	DllExport my_bool json_get_item_init(UDF_INIT*, UDF_ARGS*, char*);
-	DllExport char *json_get_item(UDF_EXEC_ARGS);
-	DllExport void json_get_item_deinit(UDF_INIT*);
-
 	DllExport my_bool json_item_merge_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *json_item_merge(UDF_EXEC_ARGS);
 	DllExport void json_item_merge_deinit(UDF_INIT*);
 
+	DllExport my_bool json_get_item_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport char *json_get_item(UDF_EXEC_ARGS);
+	DllExport void json_get_item_deinit(UDF_INIT*);
+
 	DllExport my_bool jsonget_string_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport char *jsonget_string(UDF_EXEC_ARGS);
 	DllExport void jsonget_string_deinit(UDF_INIT*);