diff --git a/release/scripts/addons b/release/scripts/addons
index 37af7e130b9..24e756c0da8 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 37af7e130b99865575f1fa2315ef806f815b0f42
+Subproject commit 24e756c0da89bdbf88dc22163ae3b7ef4f1fbb73
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 3da66d45abd..7e931eae749 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -31,6 +31,10 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct AnimationEvalContext;
 struct CurveMapping;
@@ -1200,3 +1204,7 @@ bool ui_jump_to_target_button_poll(struct bContext *C);
 
 /* interface_queries.c */
 void ui_interface_tag_script_reload_queries(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/tools b/source/tools
index 42a86b05869..dc4ccc3bfb6 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 42a86b05869c464c87185be378e668b4a9abec8b
+Subproject commit dc4ccc3bfb646ef2a558bd3565f84080e99b0e8b