Cleanup: make remaining editor include headers work in C++

48 files changed, 384 insertions, 0 deletions

diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index a49f02d28fe..04f9edeaf3a 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -24,6 +24,10 @@
 #ifndef __BIF_GLUTIL_H__
 #define __BIF_GLUTIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rcti;
 
 struct ColorManagedDisplaySettings;
@@ -177,4 +181,8 @@ void bglPolygonOffset(float viewdist, float dist);
 
 void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoomx, float zoomy);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BIF_GLUTIL_H__ */
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index e2f10357f19..f8d0300cb46 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -24,6 +24,10 @@
 #ifndef __ED_ANIM_API_H__
 #define __ED_ANIM_API_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct Depsgraph;
 struct ID;
@@ -859,4 +863,8 @@ void animviz_calc_motionpaths(struct Depsgraph *depsgraph,
 
 void animviz_get_object_motionpaths(struct Object *ob, ListBase *targets);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_ANIM_API_H__ */
diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h
index 9ff2678b53e..2eaef5e82e0 100644
--- a/source/blender/editors/include/ED_buttons.h
+++ b/source/blender/editors/include/ED_buttons.h
@@ -23,4 +23,12 @@
 #ifndef __ED_BUTTONS_H__
 #define __ED_BUTTONS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_BUTTONS_H__ */
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 22bf22e04d3..064e957225e 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -24,6 +24,10 @@
 #ifndef __ED_CLIP_H__
 #define __ED_CLIP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct ImBuf;
 struct Main;
@@ -93,4 +97,8 @@ void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mas
 /* ** clip_ops.c ** */
 void ED_operatormacros_clip(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_CLIP_H__ */
diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h
index d6d5ae299b7..95c454043da 100644
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@ -24,6 +24,10 @@
 #ifndef __ED_CURVE_H__
 #define __ED_CURVE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BPoint;
 struct Base;
 struct BezTriple;
@@ -104,4 +108,8 @@ void ED_font_undosys_type(struct UndoType *ut);
 void printknots(struct Object *obedit);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_CURVE_H__ */
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index ada90205b4a..c1f5eddd8df 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -24,6 +24,10 @@
 #ifndef __ED_DATAFILES_H__
 #define __ED_DATAFILES_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Datafiles embedded in Blender */
 
 extern int datatoc_startup_blend_size;
@@ -300,4 +304,8 @@ extern char datatoc_gp_brush_erase_hard_png[];
 extern int datatoc_gp_brush_erase_stroke_png_size;
 extern char datatoc_gp_brush_erase_stroke_png[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_DATAFILES_H__ */
diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index 98e1e99116f..71d23d5ebad 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -24,6 +24,10 @@
 #ifndef __ED_FILESELECT_H__
 #define __ED_FILESELECT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct FileSelectParams;
 struct ScrArea;
@@ -200,4 +204,8 @@ void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name);
 int ED_fsmenu_entry_get_icon(struct FSMenuEntry *fsentry);
 void ED_fsmenu_entry_set_icon(struct FSMenuEntry *fsentry, const int icon);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_FILESELECT_H__ */
diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h
index e09f101af73..07eade23506 100644
--- a/source/blender/editors/include/ED_gizmo_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -25,6 +25,10 @@
 #ifndef __ED_GIZMO_LIBRARY_H__
 #define __ED_GIZMO_LIBRARY_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* initialize gizmos */
 void ED_gizmotypes_arrow_3d(void);
 void ED_gizmotypes_button_2d(void);
@@ -237,4 +241,8 @@ void ED_gizmotypes_dial_3d_draw_util(const float matrix_basis[4][4],
                                      const bool select,
                                      struct Dial3dParams *params);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_GIZMO_LIBRARY_H__ */
diff --git a/source/blender/editors/include/ED_gizmo_utils.h b/source/blender/editors/include/ED_gizmo_utils.h
index 8c494bdf18c..70ff8a8d32f 100644
--- a/source/blender/editors/include/ED_gizmo_utils.h
+++ b/source/blender/editors/include/ED_gizmo_utils.h
@@ -23,6 +23,10 @@
 #ifndef __ED_GIZMO_UTILS_H__
 #define __ED_GIZMO_UTILS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bContext;
 struct wmGizmoGroupType;
 
@@ -39,4 +43,8 @@ bool ED_gizmo_poll_or_unlink_delayed_from_tool_ex(const struct bContext *C,
 bool ED_gizmo_poll_or_unlink_delayed_from_tool(const struct bContext *C,
                                                struct wmGizmoGroupType *gzgt);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_GIZMO_UTILS_H__ */
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 5073207daa5..d8088dd8454 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -24,6 +24,10 @@
 #ifndef __ED_GPENCIL_H__
 #define __ED_GPENCIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct ListBase;
 struct PointerRNA;
@@ -302,4 +306,8 @@ struct tGPspoint *ED_gpencil_sbuffer_ensure(struct tGPspoint *buffer_array,
 /* Tag all scene grease pencil object to update. */
 void ED_gpencil_tag_scene_gpencil(struct Scene *scene);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_GPENCIL_H__ */
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index d78c2620253..e97630cfb99 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -27,6 +27,10 @@
 #include "DNA_listBase.h"
 #include "DNA_space_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct ImBuf;
 struct Image;
@@ -142,4 +146,8 @@ ListBase ED_image_filesel_detect_sequences(struct Main *bmain,
                                            struct wmOperator *op,
                                            const bool detect_udim);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_IMAGE_H__ */
diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h
index 8a84d3646f8..82662a6b118 100644
--- a/source/blender/editors/include/ED_info.h
+++ b/source/blender/editors/include/ED_info.h
@@ -23,6 +23,10 @@
 #ifndef __ED_INFO_H__
 #define __ED_INFO_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 
 /* info_stats.c */
@@ -31,4 +35,8 @@ const char *ED_info_stats_string(struct Main *bmain,
                                  struct Scene *scene,
                                  struct ViewLayer *view_layer);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_INFO_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 2630feaa9d3..7000075d4b5 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -24,6 +24,10 @@
 #ifndef __ED_KEYFRAMES_DRAW_H__
 #define __ED_KEYFRAMES_DRAW_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct CacheFile;
 struct DLRBT_Tree;
@@ -266,4 +270,8 @@ bool actkeyblock_is_valid(ActKeyColumn *ab);
 /* Checks if ActKeyColumn can be used as a block (i.e. drawn/used to detect "holds") */
 int actkeyblock_get_valid_hold(ActKeyColumn *ab);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_KEYFRAMES_DRAW_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index c347d75fa66..d0d07fc3245 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -24,6 +24,10 @@
 #ifndef __ED_KEYFRAMES_EDIT_H__
 #define __ED_KEYFRAMES_EDIT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BezTriple;
 struct FCurve;
 struct Scene;
@@ -325,4 +329,8 @@ short paste_animedit_keys(struct bAnimContext *ac,
 
 /* ************************************************ */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_KEYFRAMES_EDIT_H__ */
diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h
index 5c3c3555d56..2e4b9472ce7 100644
--- a/source/blender/editors/include/ED_lattice.h
+++ b/source/blender/editors/include/ED_lattice.h
@@ -24,6 +24,10 @@
 #ifndef __ED_LATTICE_H__
 #define __ED_LATTICE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Base;
 struct Object;
 struct UndoType;
@@ -44,4 +48,8 @@ bool ED_lattice_deselect_all_multi(struct bContext *C);
 /* editlattice_undo.c */
 void ED_lattice_undosys_type(struct UndoType *ut);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_LATTICE_H__ */
diff --git a/source/blender/editors/include/ED_logic.h b/source/blender/editors/include/ED_logic.h
index 8158bee15f3..ae2d5038321 100644
--- a/source/blender/editors/include/ED_logic.h
+++ b/source/blender/editors/include/ED_logic.h
@@ -24,7 +24,15 @@
 #ifndef __ED_LOGIC_H__
 #define __ED_LOGIC_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* logic_ops.c */
 void ED_operatortypes_logic(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_LOGIC_H__ */
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h
index a9e57ecc13d..54a5d0cb0e1 100644
--- a/source/blender/editors/include/ED_markers.h
+++ b/source/blender/editors/include/ED_markers.h
@@ -24,6 +24,10 @@
 #ifndef __ED_MARKERS_H__
 #define __ED_MARKERS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Scene;
 struct TimeMarker;
 struct bAnimContext;
@@ -70,4 +74,8 @@ void ED_keymap_marker(struct wmKeyConfig *keyconf);
 /* debugging only */
 void debug_markers_print_list(struct ListBase *markers);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_MARKERS_H__ */
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index f4725fea039..852bc8a1394 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -24,6 +24,10 @@
 #ifndef __ED_MASK_H__
 #define __ED_MASK_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct KeyframeEditData;
 struct MaskLayer;
@@ -114,4 +118,8 @@ void paste_gpdata(void);
 void mirror_masklayer_frames(struct MaskLayer *mask_layer, short mode);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_MASK_H__ */
diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h
index 8ffae0f2b66..4ecf97108e8 100644
--- a/source/blender/editors/include/ED_mball.h
+++ b/source/blender/editors/include/ED_mball.h
@@ -24,6 +24,10 @@
 #ifndef __ED_MBALL_H__
 #define __ED_MBALL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Base;
 struct Object;
 struct UndoType;
@@ -56,4 +60,8 @@ void ED_mball_undosys_type(struct UndoType *ut);
 
 #define MBALL_NOSEL (1u << 31u)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_MBALL_H__ */
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index de7d2e1a395..eedee9d5280 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -24,6 +24,10 @@
 #ifndef __ED_NODE_H__
 #define __ED_NODE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct Main;
 struct Scene;
@@ -110,4 +114,8 @@ void ED_operatormacros_node(void);
 bool ED_space_node_color_sample(
     struct Main *bmain, struct SpaceNode *snode, struct ARegion *ar, int mval[2], float r_col[3]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_NODE_H__ */
diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.h
index b13f228b1ec..8c8f3e6f4a3 100644
--- a/source/blender/editors/include/ED_numinput.h
+++ b/source/blender/editors/include/ED_numinput.h
@@ -21,6 +21,10 @@
 #ifndef __ED_NUMINPUT_H__
 #define __ED_NUMINPUT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NUM_STR_REP_LEN 64
 #define NUM_MAX_ELEMENTS 3
 
@@ -104,4 +108,8 @@ bool user_string_to_number(
 
 /** \} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_NUMINPUT_H__ */
diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h
index 3015d8d9cdc..be1ee786a75 100644
--- a/source/blender/editors/include/ED_outliner.h
+++ b/source/blender/editors/include/ED_outliner.h
@@ -23,6 +23,10 @@
 #ifndef __ED_OUTLINER_H__
 #define __ED_OUTLINER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 struct bContext;
 
@@ -44,4 +48,8 @@ void ED_outliner_select_sync_from_outliner(struct bContext *C, struct SpaceOutli
 
 void ED_outliner_select_sync_flag_outliners(const struct bContext *C);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_OUTLINER_H__ */
diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h
index e15e4c45c4a..065eb082e4d 100644
--- a/source/blender/editors/include/ED_paint.h
+++ b/source/blender/editors/include/ED_paint.h
@@ -21,6 +21,10 @@
 #ifndef __ED_PAINT_H__
 #define __ED_PAINT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ImBuf;
 struct Image;
 struct UndoStep;
@@ -96,4 +100,8 @@ void ED_paintcurve_undo_push_end(void);
 
 void ED_paintcurve_undosys_type(struct UndoType *ut);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_PAINT_H__ */
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 0c973f4ca88..c8a4dc5b49d 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -24,6 +24,10 @@
 #ifndef __ED_PARTICLE_H__
 #define __ED_PARTICLE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Object;
 struct PTCacheEdit;
 struct ParticleEditSettings;
@@ -76,4 +80,8 @@ bool PE_deselect_all_visible(struct bContext *C);
 /* particle_edit_undo.c */
 void ED_particle_undosys_type(struct UndoType *ut);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_PARTICLE_H__ */
diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h
index 1006a9d4f47..ebd7e387c83 100644
--- a/source/blender/editors/include/ED_physics.h
+++ b/source/blender/editors/include/ED_physics.h
@@ -24,6 +24,10 @@
 #ifndef __ED_PHYSICS_H__
 #define __ED_PHYSICS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ReportList;
 struct bContext;
 struct wmKeyConfig;
@@ -56,4 +60,8 @@ void ED_rigidbody_constraint_remove(struct Main *bmain, struct Scene *scene, str
 void ED_operatortypes_physics(void);
 void ED_keymap_physics(struct wmKeyConfig *keyconf);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_PHYSICS_H__ */
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index d36d2559f26..0645b256a15 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -26,6 +26,10 @@
 
 #include "DNA_vec_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct DEGEditorUpdateContext;
 struct ID;
 struct MTex;
@@ -103,4 +107,8 @@ void ED_render_clear_mtex_copybuf(void);
 
 void ED_render_internal_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.h
index 832f40d22aa..27c2e9d0df8 100644
--- a/source/blender/editors/include/ED_scene.h
+++ b/source/blender/editors/include/ED_scene.h
@@ -23,6 +23,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum eSceneCopyMethod;
 
 struct Scene *ED_scene_add(struct Main *bmain,
@@ -39,4 +43,8 @@ bool ED_scene_view_layer_delete(struct Main *bmain,
 
 void ED_operatortypes_scene(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SCENE_H__ */
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index d003dac7fbf..08efc99c5d6 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -34,6 +34,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct Depsgraph;
 struct IDProperty;
@@ -460,4 +464,8 @@ enum {
   SPACE_CONTEXT_CYCLE_NEXT,
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SCREEN_H__ */
diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h
index bbbcaab165a..2c2c1f8b27d 100644
--- a/source/blender/editors/include/ED_screen_types.h
+++ b/source/blender/editors/include/ED_screen_types.h
@@ -24,6 +24,10 @@
 #ifndef __ED_SCREEN_TYPES_H__
 #define __ED_SCREEN_TYPES_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ----------------------------------------------------- */
 
 /* for animplayer */
@@ -133,4 +137,8 @@ enum {
   AZONE_REGION_SCROLL,
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SCREEN_TYPES_H__ */
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index 4a0ce7b0078..cac1621962e 100644
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@ -24,6 +24,10 @@
 #ifndef __ED_SCULPT_H__
 #define __ED_SCULPT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct Object;
 struct UndoType;
@@ -50,4 +54,8 @@ void ED_sculpt_undosys_type(struct UndoType *ut);
 void ED_sculpt_undo_geometry_begin(struct Object *ob, const char *name);
 void ED_sculpt_undo_geometry_end(struct Object *ob);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SCULPT_H__ */
diff --git a/source/blender/editors/include/ED_select_utils.h b/source/blender/editors/include/ED_select_utils.h
index 954e4335608..9a4846391c2 100644
--- a/source/blender/editors/include/ED_select_utils.h
+++ b/source/blender/editors/include/ED_select_utils.h
@@ -21,6 +21,10 @@
 #ifndef __ED_SELECT_UTILS_H__
 #define __ED_SELECT_UTILS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct KDTree_1d;
 
 enum {
@@ -64,4 +68,8 @@ bool ED_select_similar_compare_float_tree(const struct KDTree_1d *tree,
 
 eSelectOp ED_select_op_modal(const eSelectOp sel_op, const bool is_first);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SELECT_UTILS_H__ */
diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h
index 2e89af4bb3f..f35ed12cdb9 100644
--- a/source/blender/editors/include/ED_sequencer.h
+++ b/source/blender/editors/include/ED_sequencer.h
@@ -23,6 +23,10 @@
 #ifndef __ED_SEQUENCER_H__
 #define __ED_SEQUENCER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Scene;
 struct Sequence;
 struct SpaceSeq;
@@ -46,4 +50,8 @@ Sequence *ED_sequencer_special_preview_get(void);
 void ED_sequencer_special_preview_set(struct bContext *C, const int mval[2]);
 void ED_sequencer_special_preview_clear(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_SEQUENCER_H__ */
diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h
index 44b3c5a6b79..f7632bc81cb 100644
--- a/source/blender/editors/include/ED_sound.h
+++ b/source/blender/editors/include/ED_sound.h
@@ -24,6 +24,14 @@
 #ifndef __ED_SOUND_H__
 #define __ED_SOUND_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void ED_operatortypes_sound(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SOUND_H__ */
diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index 766f2b31192..9005ce1b3a5 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -24,6 +24,10 @@
 #ifndef __ED_SPACE_API_H__
 #define __ED_SPACE_API_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegionType;
 struct bContext;
 
@@ -74,4 +78,8 @@ void ED_region_draw_cb_exit(struct ARegionType *, void *);
 /* ed_util.c */
 void ED_region_draw_mouse_line_cb(const struct bContext *C, struct ARegion *ar, void *arg_info);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_SPACE_API_H__ */
diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h
index ade1dde6c33..98370b34665 100644
--- a/source/blender/editors/include/ED_text.h
+++ b/source/blender/editors/include/ED_text.h
@@ -24,6 +24,10 @@
 #ifndef __ED_TEXT_H__
 #define __ED_TEXT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct SpaceText;
 struct Text;
@@ -44,4 +48,8 @@ struct UndoStep *ED_text_undo_push_init(struct bContext *C);
 /* text_format.c */
 bool ED_text_is_syntax_highlight_supported(struct Text *text);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TEXT_H__ */
diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h
index f010c45d939..0bcc39847c4 100644
--- a/source/blender/editors/include/ED_time_scrub_ui.h
+++ b/source/blender/editors/include/ED_time_scrub_ui.h
@@ -24,6 +24,10 @@
 #ifndef __ED_TIME_SCRUB_UI_H__
 #define __ED_TIME_SCRUB_UI_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bContext;
 struct bDopeSheet;
 struct wmEvent;
@@ -39,4 +43,8 @@ void ED_time_scrub_channel_search_draw(const struct bContext *C,
                                        struct ARegion *ar,
                                        struct bDopeSheet *dopesheet);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TIME_SCRUB_UI_H__ */
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index d53ad7c4229..2a5803cbc4d 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -24,6 +24,10 @@
 #ifndef __ED_TRANSFORM_H__
 #define __ED_TRANSFORM_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ******************* Registration Function ********************** */
 
 struct Object;
@@ -206,4 +210,8 @@ int ED_transform_calc_gizmo_stats(const struct bContext *C,
                                   const struct TransformCalcParams *params,
                                   struct TransformBounds *tbounds);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TRANSFORM_H__ */
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index 0e20abe4221..1277e01859d 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -21,6 +21,10 @@
 #ifndef __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__
 #define __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMEdge;
 struct BMFace;
 struct BMVert;
@@ -149,4 +153,8 @@ bool ED_transform_snap_object_project_all_view3d_ex(SnapObjectContext *sctx,
                                                     bool sort,
                                                     ListBase *r_hit_list);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ */
diff --git a/source/blender/editors/include/ED_transverts.h b/source/blender/editors/include/ED_transverts.h
index 3460aae32c0..062658a562b 100644
--- a/source/blender/editors/include/ED_transverts.h
+++ b/source/blender/editors/include/ED_transverts.h
@@ -24,6 +24,10 @@
 #ifndef __ED_TRANSVERTS_H__
 #define __ED_TRANSVERTS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Object;
 
 typedef struct TransVert {
@@ -68,4 +72,8 @@ enum {
   TX_VERT_USE_NORMAL = (1 << 2), /* avoid nonzero check */
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TRANSVERTS_H__ */
diff --git a/source/blender/editors/include/ED_types.h b/source/blender/editors/include/ED_types.h
index 4b18bb699a9..4abb7d446d1 100644
--- a/source/blender/editors/include/ED_types.h
+++ b/source/blender/editors/include/ED_types.h
@@ -24,6 +24,10 @@
 #ifndef __ED_TYPES_H__
 #define __ED_TYPES_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* **************** GENERAL EDITOR-WIDE TYPES AND DEFINES ************************** */
 
 /* old blender defines... should be deprecated? */
@@ -35,4 +39,8 @@
 // #define BASACT                    (scene->basact)
 // #define OBACT                     (BASACT ? BASACT->object : NULL)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_TYPES_H__ */
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h
index 1fbf2f96cfa..983e0c4f14a 100644
--- a/source/blender/editors/include/ED_undo.h
+++ b/source/blender/editors/include/ED_undo.h
@@ -23,6 +23,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Base;
 struct CLG_LogRef;
 struct Object;
@@ -82,4 +86,8 @@ void ED_undosys_type_free(void);
 /* memfile_undo.c */
 struct MemFile *ED_undosys_stack_memfile_get_active(struct UndoStack *ustack);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_UNDO_H__ */
diff --git a/source/blender/editors/include/ED_userpref.h b/source/blender/editors/include/ED_userpref.h
index 686b8a689f0..1d43009e37c 100644
--- a/source/blender/editors/include/ED_userpref.h
+++ b/source/blender/editors/include/ED_userpref.h
@@ -21,6 +21,14 @@
 #ifndef __ED_USERPREF_H__
 #define __ED_USERPREF_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void ED_operatortypes_userpref(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_USERPREF_H__ */
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 8cce8fa973a..8b4829446c3 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -26,6 +26,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 struct bContext;
 struct wmOperatorType;
@@ -64,4 +68,8 @@ void unpack_menu(struct bContext *C,
                  const char *folder,
                  struct PackedFile *pf);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_UTIL_H__ */
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index c912778afd8..1671d220d81 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -24,6 +24,10 @@
 #ifndef __ED_UVEDIT_H__
 #define __ED_UVEDIT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegionType;
 struct BMEditMesh;
 struct BMFace;
@@ -206,4 +210,8 @@ void ED_uvedit_draw_main(struct SpaceImage *sima,
 /* uvedit_buttons.c */
 void ED_uvedit_buttons_register(struct ARegionType *art);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_UVEDIT_H__ */
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index a1bc3b028b6..66468275a1e 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -24,6 +24,10 @@
 #ifndef __ED_VIEW3D_H__
 #define __ED_VIEW3D_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ********* exports for space_view3d/ module ********** */
 struct ARegion;
 struct BMEdge;
@@ -747,4 +751,8 @@ void ED_view3d_buttons_region_layout_ex(const struct bContext *C,
 bool ED_view3d_local_collections_set(struct Main *bmain, struct View3D *v3d);
 void ED_view3d_local_collections_reset(struct bContext *C, const bool reset_all);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_VIEW3D_H__ */
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 45fa9bc8442..6bf0cb8952d 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -24,6 +24,10 @@
 #ifndef __UI_INTERFACE_ICONS_H__
 #define __UI_INTERFACE_ICONS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct PointerRNA;
 struct PreviewImage;
@@ -92,4 +96,8 @@ struct PreviewImage *UI_icon_to_preview(int icon_id);
 int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, const bool big);
 int UI_idcode_icon_get(const int idcode);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __UI_INTERFACE_ICONS_H__ */
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 8730d945c81..c1de697b0c5 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -26,6 +26,10 @@
 
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Define icon enum. */
 #define DEF_ICON(name) ICON_##name,
 #define DEF_ICON_VECTOR(name) ICON_##name,
@@ -444,4 +448,8 @@ const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, i
 
 void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __UI_RESOURCES_H__ */
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index e34f40d057d..17d950f5e40 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -28,6 +28,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ------------------------------------------ */
 /* Settings and Defines:                      */
 
@@ -273,4 +277,8 @@ void UI_view2d_smooth_view(struct bContext *C,
 /* Caller passes in own idname.  */
 void VIEW2D_GGT_navigate_impl(struct wmGizmoGroupType *gzgt, const char *idname);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __UI_VIEW2D_H__ */