Cleanup: make remaining blenkernel headers work in C++

source/blender/blenkernel/BKE_DerivedMesh.h

@@ -72,6 +72,10 @@
 #include "BKE_customdata.h"
 #include "BKE_bvhutils.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMEditMesh;
 struct CCGElem;
 struct CCGKey;
@@ -383,4 +387,8 @@ void DM_debug_print_cdlayers(CustomData *cdata);
 bool DM_is_valid(DerivedMesh *dm);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_DERIVEDMESH_H__ */

source/blender/blenkernel/BKE_addon.h

@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 struct bAddon;
 
@@ -49,4 +53,8 @@ struct bAddon *BKE_addon_ensure(struct ListBase *addon_list, const char *module)
 bool BKE_addon_remove_safe(struct ListBase *addon_list, const char *module);
 void BKE_addon_free(struct bAddon *addon);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_ADDON_H__ */

source/blender/blenkernel/BKE_anim.h

@@ -22,6 +22,11 @@
 /** \file
  * \ingroup bke
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct ListBase;
 struct Object;
@@ -89,4 +94,8 @@ typedef struct DupliObject {
   unsigned int random_id;
 } DupliObject;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_appdir.h

@@ -19,6 +19,11 @@
 /** \file
  * \ingroup bli
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 
 /* note on naming: typical _get() suffix is omitted here,
@@ -93,4 +98,8 @@ enum {
 #define BLENDER_HISTORY_FILE "recent-files.txt"
 #define BLENDER_PLATFORM_SUPPORT_FILE "platform_support.txt"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_APPDIR_H__ */

source/blender/blenkernel/BKE_armature.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Bone;
 struct Depsgraph;
 struct ListBase;
@@ -58,9 +62,6 @@ typedef struct PoseTree {
 } PoseTree;
 
 /*  Core armature functionality */
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct bArmature *BKE_armature_add(struct Main *bmain, const char *name);
 struct bArmature *BKE_armature_from_object(struct Object *ob);

source/blender/blenkernel/BKE_autoexec.h

@@ -20,6 +20,14 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool BKE_autoexec_match(const char *path);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_AUTOEXEC_H__ */

source/blender/blenkernel/BKE_boids.h

@@ -26,6 +26,10 @@
 
 #include "DNA_boid_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct RNG;
 
 typedef struct BoidBrainData {
@@ -53,4 +57,9 @@ BoidState *boid_duplicate_state(BoidSettings *boids, BoidState *state);
 void boid_free_settings(BoidSettings *boids);
 BoidSettings *boid_copy_settings(const BoidSettings *boids);
 BoidState *boid_get_current_state(BoidSettings *boids);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_bpath.h

@@ -23,6 +23,10 @@
 #ifndef __BKE_BPATH_H__
 #define __BKE_BPATH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct ListBase;
 struct Main;
@@ -85,4 +89,8 @@ void BKE_bpath_absolute_convert(struct Main *bmain,
                                 const char *basedir,
                                 struct ReportList *reports);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_BPATH_H__ */

source/blender/blenkernel/BKE_brush.h

@@ -23,6 +23,12 @@
  * General operations for brushes.
  */
 
+#include "DNA_object_enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum eCurveMappingPreset;
 struct Brush;
 struct ImBuf;
@@ -34,8 +40,6 @@ struct UnifiedPaintSettings;
 
 // enum eCurveMappingPreset;
 
-#include "DNA_object_enums.h"
-
 /* globals for brush execution */
 void BKE_brush_system_init(void);
 void BKE_brush_system_exit(void);
@@ -140,4 +144,8 @@ void BKE_brush_scale_size(int *r_brush_size,
 /* debugging only */
 void BKE_brush_debug_print_state(struct Brush *br);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_bvhutils.h

@@ -26,6 +26,10 @@
 #include "BLI_bitmap.h"
 #include "BLI_kdopbvh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * This header encapsulates necessary code to build a BVH
  */
@@ -244,4 +248,8 @@ bool bvhcache_has_tree(const BVHCache *cache, const BVHTree *tree);
 void bvhcache_insert(BVHCache **cache_p, BVHTree *tree, int type);
 void bvhcache_free(BVHCache **cache_p);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_callbacks.h

@@ -21,6 +21,10 @@
 #ifndef __BKE_CALLBACKS_H__
 #define __BKE_CALLBACKS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct ID;
 struct Main;
@@ -81,4 +85,8 @@ void BKE_callback_add(bCallbackFuncStore *funcstore, eCbEvent evt);
 void BKE_callback_global_init(void);
 void BKE_callback_global_finalize(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_CALLBACKS_H__ */

source/blender/blenkernel/BKE_ccg.h

@@ -31,6 +31,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CCGSubSurf;
 
 /* Each CCGElem is CCGSubSurf's representation of a subdivided
@@ -159,4 +163,8 @@ BLI_INLINE CCGElem *CCG_elem_next(const CCGKey *key, CCGElem *elem)
   return CCG_elem_offset(key, elem, 1);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_cdderivedmesh.h

@@ -29,6 +29,10 @@
 #ifndef __BKE_CDDERIVEDMESH_H__
 #define __BKE_CDDERIVEDMESH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct DerivedMesh;
 struct Mesh;
 
@@ -42,4 +46,8 @@ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh);
  * custom element data. */
 struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_cloth.h

@@ -26,6 +26,10 @@
 #include <float.h>
 #include "BLI_math_inline.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ClothModifierData;
 struct CollisionModifierData;
 struct Depsgraph;
@@ -299,4 +303,8 @@ void cloth_parallel_transport_hair_frame(float mat[3][3],
 
 ////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_collision.h

@@ -34,6 +34,10 @@
 
 #include "BLI_kdopbvh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Collection;
 struct CollisionModifierData;
 struct Depsgraph;
@@ -171,4 +175,8 @@ void BKE_collider_cache_free(struct ListBase **colliders);
 
 /////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_colortools.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ColorManagedColorspaceSettings;
 struct ColorManagedDisplaySettings;
 struct ColorManagedViewSettings;
@@ -137,4 +141,9 @@ void BKE_color_managed_colorspace_settings_copy(
 bool BKE_color_managed_colorspace_settings_equals(
     const struct ColorManagedColorspaceSettings *settings1,
     const struct ColorManagedColorspaceSettings *settings2);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_curve.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
@@ -292,4 +296,8 @@ void BKE_curve_decimate_nurb(struct Nurb *nu,
 extern void (*BKE_curve_batch_cache_dirty_tag_cb)(struct Curve *cu, int mode);
 extern void (*BKE_curve_batch_cache_free_cb)(struct Curve *cu);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_CURVE_H__ */

source/blender/blenkernel/BKE_curveprofile.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CurveProfile;
 struct CurveProfilePoint;
 
@@ -73,4 +77,9 @@ void BKE_curveprofile_evaluate_length_portion(const struct CurveProfile *profile
                                               float length_portion,
                                               float *x_out,
                                               float *y_out);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_customdata_file.h

@@ -21,6 +21,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CDF_TYPE_IMAGE 0
 #define CDF_TYPE_MESH 1
 
@@ -53,4 +57,8 @@ void cdf_remove(const char *filename);
 CDataFileLayer *cdf_layer_find(CDataFile *cdf, int type, const char *name);
 CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t datasize);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_CUSTOMDATA_FILE_H__ */

source/blender/blenkernel/BKE_displist.h

@@ -27,6 +27,10 @@
 #include "DNA_customdata_types.h"
 #include "BKE_customdata.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* dl->type */
 #define DL_POLY 0
 #define DL_SEGM 1
@@ -112,4 +116,8 @@ float BKE_displist_calc_taper(
 
 void BKE_displist_minmax(struct ListBase *dispbase, float min[3], float max[3]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_displist_tangent.h

@@ -21,6 +21,14 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void BKE_displist_tangent_calc(const DispList *dl, float (*fnormals)[3], float (**r_tangent)[4]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_DISPLIST_TANGENT_H__ */

source/blender/blenkernel/BKE_dynamicpaint.h

@@ -21,6 +21,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
@@ -114,4 +118,8 @@ void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface,
 #define DPAINT_WAVE_OBSTACLE 1
 #define DPAINT_WAVE_REFLECT_ONLY 2
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_DYNAMICPAINT_H__ */

source/blender/blenkernel/BKE_editlattice.h

@@ -21,10 +21,18 @@
 #ifndef __BKE_EDITLATTICE_H__
 #define __BKE_EDITLATTICE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Object;
 
 void BKE_editlattice_free(struct Object *ob);
 void BKE_editlattice_make(struct Object *obedit);
 void BKE_editlattice_load(struct Object *obedit);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_EDITLATTICE_H__ */

source/blender/blenkernel/BKE_editmesh.h

@@ -28,6 +28,10 @@
 #include "BKE_customdata.h"
 #include "bmesh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMLoop;
 struct BMesh;
 struct BoundBox;
@@ -100,4 +104,8 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em, struct Mesh *me);
 void BKE_editmesh_ensure_autosmooth(BMEditMesh *em, struct Mesh *me);
 struct BoundBox *BKE_editmesh_cage_boundbox_get(BMEditMesh *em);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_EDITMESH_H__ */

source/blender/blenkernel/BKE_editmesh_bvh.h

@@ -24,6 +24,10 @@
 #ifndef __BKE_EDITMESH_BVH_H__
 #define __BKE_EDITMESH_BVH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMBVHTree;
 struct BMEditMesh;
 struct BMFace;
@@ -97,4 +101,8 @@ enum {
   BMBVH_RESPECT_HIDDEN = (1 << 2),
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_EDITMESH_BVH_H__ */

source/blender/blenkernel/BKE_editmesh_cache.h

@@ -21,6 +21,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMEditMesh;
 struct EditMeshData;
 
@@ -29,4 +33,8 @@ void BKE_editmesh_cache_ensure_vert_normals(struct BMEditMesh *em, struct EditMe
 
 void BKE_editmesh_cache_ensure_poly_centers(struct BMEditMesh *em, struct EditMeshData *emd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_EDITMESH_CACHE_H__ */

source/blender/blenkernel/BKE_editmesh_tangent.h

@@ -21,6 +21,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void BKE_editmesh_loop_tangent_calc(BMEditMesh *em,
                                     bool calc_active_tangent,
                                     const char (*tangent_names)[MAX_NAME],
@@ -32,4 +36,8 @@ void BKE_editmesh_loop_tangent_calc(BMEditMesh *em,
                                     const uint dm_loopdata_out_len,
                                     short *tangent_mask_curr_p);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_EDITMESH_TANGENT_H__ */

source/blender/blenkernel/BKE_effect.h

@@ -27,6 +27,10 @@
 
 #include "BLI_utildefines.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Collection;
 struct Depsgraph;
 struct ListBase;
@@ -275,4 +279,8 @@ void BKE_sim_debug_data_remove_element(unsigned int hash);
 void BKE_sim_debug_data_clear(void);
 void BKE_sim_debug_data_clear_category(const char *category);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_fluid.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct FluidDomainSettings;
 struct FluidEffectorSettings;
@@ -89,4 +93,8 @@ void BKE_fluid_flow_behavior_set(struct Object *object,
                                  struct FluidFlowSettings *settings,
                                  int behavior);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_FLUID_H__ */

source/blender/blenkernel/BKE_gpencil.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BoundBox;
 struct Brush;
 struct CurveMapping;
@@ -272,4 +276,8 @@ void BKE_gpencil_convert_curve(struct Main *bmain,
 extern void (*BKE_gpencil_batch_cache_dirty_tag_cb)(struct bGPdata *gpd);
 extern void (*BKE_gpencil_batch_cache_free_cb)(struct bGPdata *gpd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __BKE_GPENCIL_H__ */

source/blender/blenkernel/BKE_gpencil_modifier.h

@@ -22,6 +22,10 @@
 
 #include "DNA_gpencil_modifier_types.h" /* needed for all enum typdefs */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct GpencilModifierData;
 struct ID;
@@ -318,4 +322,8 @@ void BKE_gpencil_modifiers_calc(struct Depsgraph *depsgraph,
                                 struct Scene *scene,
                                 struct Object *ob);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_GPENCIL_MODIFIER_H__ */

source/blender/blenkernel/BKE_icons.h

@@ -26,6 +26,10 @@
  * Resizable Icons for Blender
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (*DrawInfoFreeFP)(void *drawinfo);
 
 enum {
@@ -166,4 +170,8 @@ int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type);
 
 #define ICON_RENDER_DEFAULT_HEIGHT 32
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __BKE_ICONS_H__ */

source/blender/blenkernel/BKE_idcode.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 const char *BKE_idcode_to_name(short idcode);
 const char *BKE_idcode_to_name_plural(short idcode);
 const char *BKE_idcode_to_translation_context(short idcode);
@@ -39,4 +43,8 @@ short BKE_idcode_from_index(const int index);
 
 short BKE_idcode_iter_step(int *index);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_kelvinlet.h

@@ -25,6 +25,10 @@
 
 #include "BLI_math.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Regularized Kelvinlets: Sculpting Brushes based on Fundamental Solutions of Elasticity
  * Pixar Technical Memo #17-03 */
 
@@ -74,4 +78,8 @@ void BKE_kelvinlet_twist(float r_elem_disp[3],
                          const float brush_location[3],
                          const float surface_normal[3]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_keyconfig.h

@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Based on #BKE_addon_pref_type_init and friends */
 
 struct UserDef;
@@ -69,4 +73,8 @@ void BKE_keyconfig_pref_filter_items(struct UserDef *userdef,
                                      bool (*filter_fn)(struct wmKeyMapItem *kmi, void *user_data),
                                      void *user_data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_KEYCONFIG_H__ */

source/blender/blenkernel/BKE_lattice.h

@@ -26,6 +26,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BPoint;
 struct Depsgraph;
 struct Lattice;
@@ -140,4 +144,8 @@ void BKE_lattice_batch_cache_free(struct Lattice *lt);
 extern void (*BKE_lattice_batch_cache_dirty_tag_cb)(struct Lattice *lt, int mode);
 extern void (*BKE_lattice_batch_cache_free_cb)(struct Lattice *lt);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_LATTICE_H__ */

source/blender/blenkernel/BKE_lib_override.h

@@ -39,6 +39,10 @@
  *    of IDs in a given Main data-base.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct IDOverrideLibrary;
 struct IDOverrideLibraryProperty;
@@ -111,4 +115,8 @@ void BKE_lib_override_library_operations_store_end(OverrideLibraryStorage *overr
                                                    struct ID *local);
 void BKE_lib_override_library_operations_store_finalize(OverrideLibraryStorage *override_storage);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_LIB_OVERRIDE_H__ */

source/blender/blenkernel/BKE_lib_query.h

@@ -35,6 +35,10 @@
  * - `BKE_lib_query_` should be used for functions in that file.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct Main;
 
@@ -131,4 +135,8 @@ void BKE_library_ID_test_usages(struct Main *bmain,
 void BKE_library_unused_linked_data_set_tag(struct Main *bmain, const bool do_init_tag);
 void BKE_library_indirectly_used_data_tag_clear(struct Main *bmain);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_LIB_QUERY_H__ */

source/blender/blenkernel/BKE_lightprobe.h

@@ -25,6 +25,10 @@
  * \brief General operations for probes.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct LightProbe;
 struct Main;
 
@@ -39,4 +43,8 @@ struct LightProbe *BKE_lightprobe_copy(struct Main *bmain, const struct LightPro
 void BKE_lightprobe_make_local(struct Main *bmain, struct LightProbe *probe, const bool lib_local);
 void BKE_lightprobe_free(struct LightProbe *probe);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_LIGHTPROBE_H__ */

source/blender/blenkernel/BKE_main_idmap.h

@@ -32,6 +32,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct IDNameLib_Map;
 struct Main;
@@ -52,4 +56,8 @@ struct ID *BKE_main_idmap_lookup_id(struct IDNameLib_Map *id_typemap,
                                     const struct ID *id) ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL(1, 2);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MAIN_IDMAP_H__ */

source/blender/blenkernel/BKE_mask.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct Image;
 struct ImageUser;
@@ -330,4 +334,8 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle,
                               const unsigned int height,
                               float *buffer);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MASK_H__ */

source/blender/blenkernel/BKE_mball.h

@@ -22,6 +22,11 @@
 /** \file
  * \ingroup bke
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Base;
 struct BoundBox;
 struct Depsgraph;
@@ -92,4 +97,8 @@ void BKE_mball_batch_cache_free(struct MetaBall *mb);
 extern void (*BKE_mball_batch_cache_dirty_tag_cb)(struct MetaBall *mb, int mode);
 extern void (*BKE_mball_batch_cache_free_cb)(struct MetaBall *mb);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_mball_tessellate.h

@@ -19,6 +19,11 @@
 /** \file
  * \ingroup bke
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct Object;
 struct Scene;
@@ -30,4 +35,8 @@ void BKE_mball_polygonize(struct Depsgraph *depsgraph,
 
 void BKE_mball_cubeTable_free(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MBALL_TESSELLATE_H__ */

source/blender/blenkernel/BKE_mesh_iterators.h

@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 
 typedef enum MeshForeachFlag {
@@ -63,4 +67,8 @@ void BKE_mesh_foreach_mapped_vert_coords_get(struct Mesh *me_eval,
                                              float (*r_cos)[3],
                                              const int totcos);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_ITERATORS_H__ */

source/blender/blenkernel/BKE_mesh_mapping.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct MEdge;
 struct MLoop;
 struct MLoopTri;
@@ -251,4 +255,8 @@ int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge,
     CHECK_TYPE_ANY(_v, unsigned int, const unsigned int, int, const int)), \
    (((_tri)[0] == _v) ? 0 : ((_tri)[1] == _v) ? 1 : ((_tri)[2] == _v) ? 2 : -1))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_MAPPING_H__ */

source/blender/blenkernel/BKE_mesh_mirror.h

@@ -26,6 +26,10 @@
 
 #include "BLI_utildefines.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct MirrorModifierData;
 struct ModifierEvalContext;
 struct Object;
@@ -42,4 +46,8 @@ struct Mesh *BKE_mesh_mirror_apply_mirror_on_axis(struct MirrorModifierData *mmd
                                                   const struct Mesh *mesh,
                                                   int axis);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_MIRROR_H__ */

source/blender/blenkernel/BKE_mesh_remap.h

@@ -21,6 +21,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CustomData;
 struct CustomData_MeshMasks;
 struct MVert;
@@ -227,4 +231,8 @@ void BKE_mesh_remap_calc_polys_from_mesh(const int mode,
                                          struct Mesh *me_src,
                                          struct MeshPairRemap *r_map);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_REMAP_H__ */

source/blender/blenkernel/BKE_mesh_remesh_voxel.h

@@ -28,6 +28,10 @@
 #  include "openvdb_capi.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 
 /* OpenVDB Voxel Remesher */
@@ -57,4 +61,8 @@ struct Mesh *BKE_mesh_remesh_quadriflow_to_mesh_nomain(struct Mesh *mesh,
 /* Data reprojection functions */
 void BKE_mesh_remesh_reproject_paint_mask(struct Mesh *target, struct Mesh *source);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_REMESH_VOXEL_H__ */

source/blender/blenkernel/BKE_mesh_runtime.h

@@ -27,6 +27,10 @@
 
 //#include "BKE_customdata.h"  /* for CustomDataMask */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CustomData;
 struct CustomData_MeshMasks;
 struct Depsgraph;
@@ -103,4 +107,8 @@ void BKE_mesh_runtime_debug_print_cdlayers(struct CustomData *data);
 bool BKE_mesh_runtime_is_valid(struct Mesh *me_eval);
 #endif /* NDEBUG */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_RUNTIME_H__ */

source/blender/blenkernel/BKE_mesh_tangent.h

@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ReportList;
 
 void BKE_mesh_calc_loop_tangent_single_ex(const struct MVert *mverts,
@@ -80,4 +84,8 @@ void BKE_mesh_calc_loop_tangent_step_0(const struct CustomData *loopData,
                                        char *rren_uv_name,
                                        short *rtangent_mask);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_MESH_TANGENT_H__ */

source/blender/blenkernel/BKE_movieclip.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct ImBuf;
 struct Main;
@@ -132,4 +136,8 @@ void BKE_movieclip_eval_selection_update(struct Depsgraph *depsgraph, struct Mov
 #define MOVIECLIP_DISABLE_BLUE (1 << 2)
 #define MOVIECLIP_PREVIEW_GRAYSCALE (1 << 3)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_multires.h

@@ -26,6 +26,10 @@
 
 #include "BLI_compiler_compat.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum MultiresModifiedFlags;
 
 struct Depsgraph;
@@ -184,6 +188,10 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3]
 
 int BKE_multires_sculpt_level_get(const struct MultiresModifierData *mmd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #include "intern/multires_inline.h"
 
 #endif /* __BKE_MULTIRES_H__ */

source/blender/blenkernel/BKE_nla.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct Main;
 struct NlaStrip;
@@ -139,4 +143,8 @@ enum eNlaTime_ConvertModes {
 
 float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_node.h

@@ -34,6 +34,10 @@
 
 #include "RNA_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* not very important, but the stack solver likes to know a maximum */
 #define MAX_SOCKET 512
 
@@ -1298,4 +1302,8 @@ void BKE_nodetree_shading_params_eval(struct Depsgraph *depsgraph,
 extern struct bNodeType NodeTypeUndefined;
 extern struct bNodeSocketType NodeSocketTypeUndefined;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_NODE_H__ */

source/blender/blenkernel/BKE_outliner_treehash.h

@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BLI_mempool;
 struct ID;
 struct TreeStoreElem;
@@ -52,4 +56,8 @@ struct TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash,
 /* free treehash structure */
 void BKE_outliner_treehash_free(void *treehash);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_packedFile.h

@@ -22,6 +22,11 @@
 /** \file
  * \ingroup bke
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define RET_OK 0
 #define RET_ERROR 1
 
@@ -112,4 +117,8 @@ void BKE_packedfile_id_unpack(struct Main *bmain,
                               struct ReportList *reports,
                               enum ePF_FileStatus how);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_paint.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMFace;
 struct BMesh;
 struct Brush;
@@ -408,4 +412,9 @@ enum {
   SCULPT_MASK_LAYER_CALC_VERT = (1 << 0),
   SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1),
 };
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_particle.h

@@ -35,6 +35,10 @@
 
 #include "BKE_customdata.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ParticleKey;
 struct ParticleSettings;
 struct ParticleSystem;
@@ -630,4 +634,8 @@ void BKE_particle_batch_cache_free(struct ParticleSystem *psys);
 extern void (*BKE_particle_batch_cache_dirty_tag_cb)(struct ParticleSystem *psys, int mode);
 extern void (*BKE_particle_batch_cache_free_cb)(struct ParticleSystem *psys);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_PARTICLE_H__ */

source/blender/blenkernel/BKE_pointcache.h

@@ -30,6 +30,10 @@
 #include "DNA_boid_types.h"
 #include <stdio.h> /* for FILE */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Point cache clearing option, for BKE_ptcache_id_clear, before
  * and after are non inclusive (they wont remove the cfra) */
 #define PTCACHE_CLEAR_ALL 0
@@ -378,4 +382,8 @@ void BKE_ptcache_validate(struct PointCache *cache, int framenr);
 /* Set correct flags after unsuccessful simulation step */
 void BKE_ptcache_invalidate(struct PointCache *cache);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_rigidbody.h

@@ -25,6 +25,10 @@
 #ifndef __BKE_RIGIDBODY_H__
 #define __BKE_RIGIDBODY_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct RigidBodyOb;
 struct RigidBodyWorld;
 
@@ -155,4 +159,8 @@ void BKE_rigidbody_object_sync_transforms(struct Depsgraph *depsgraph,
                                           struct Scene *scene,
                                           struct Object *ob);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_RIGIDBODY_H__ */

source/blender/blenkernel/BKE_screen.h

@@ -23,6 +23,14 @@
  * \ingroup bke
  */
 
+#include "BLI_compiler_attrs.h"
+
+#include "RNA_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct Header;
 struct ID;
@@ -49,10 +57,6 @@ struct wmNotifier;
 struct wmWindow;
 struct wmWindowManager;
 
-#include "BLI_compiler_attrs.h"
-
-#include "RNA_types.h"
-
 /* spacetype has everything stored to get an editor working, it gets initialized via
  * ED_spacetypes_init() in editors/space_api/spacetypes.c   */
 /* an editor in Blender is a combined ScrArea + SpaceType + SpaceData */
@@ -388,4 +392,8 @@ void BKE_screen_remove_unused_scrverts(struct bScreen *sc);
 
 void BKE_screen_header_alignment_reset(struct bScreen *screen);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_shader_fx.h

@@ -24,6 +24,10 @@
 #include "BLI_compiler_attrs.h"
 #include "BKE_customdata.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct ListBase;
 struct ModifierUpdateDepsgraphContext;
@@ -175,4 +179,8 @@ void BKE_shaderfx_foreachIDLink(struct Object *ob, ShaderFxIDWalkFunc walk, void
 
 bool BKE_shaderfx_has_gpencil(struct Object *ob);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SHADER_FX_H__ */

source/blender/blenkernel/BKE_shrinkwrap.h

@@ -27,6 +27,10 @@
 #include "BKE_bvhutils.h"
 #include "BLI_bitmap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Shrinkwrap is composed by a set of functions and options that define the type of shrink.
  *
@@ -185,4 +189,8 @@ void BKE_shrinkwrap_snap_point_to_surface(const struct ShrinkwrapTreeData *tree,
     0, \
   }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SHRINKWRAP_H__ */

source/blender/blenkernel/BKE_softbody.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct Object;
 struct Scene;
@@ -69,4 +73,8 @@ extern void sbSetInterruptCallBack(int (*f)(void));
 
 extern void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float lscale[3][3]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_speaker.h

@@ -22,6 +22,10 @@
  * \brief General operations for speakers.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 struct Speaker;
 
@@ -35,4 +39,8 @@ struct Speaker *BKE_speaker_copy(struct Main *bmain, const struct Speaker *spk);
 void BKE_speaker_make_local(struct Main *bmain, struct Speaker *spk, const bool lib_local);
 void BKE_speaker_free(struct Speaker *spk);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_studiolight.h

@@ -32,6 +32,10 @@
 
 #include "DNA_userdef_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ImBuf;
 
 /*
@@ -161,4 +165,8 @@ void BKE_studiolight_set_free_function(StudioLight *sl,
                                        void *data);
 void BKE_studiolight_unset_icon_id(StudioLight *sl, int icon_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __BKE_STUDIOLIGHT_H__ */

source/blender/blenkernel/BKE_subdiv.h

@@ -27,6 +27,10 @@
 #include "BLI_compiler_compat.h"
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 struct MultiresModifierData;
 struct OpenSubdiv_Converter;
@@ -283,6 +287,10 @@ BLI_INLINE int BKE_subdiv_rotate_quad_to_corner(const float quad_u,
 BLI_INLINE void BKE_subdiv_rotate_grid_to_quad(
     const int corner, const float grid_u, const float grid_v, float *r_quad_u, float *r_quad_v);
 
+#ifdef __cplusplus
+}
+#endif
+
 #include "intern/subdiv_inline.h"
 
 #endif /* __BKE_SUBDIV_H__ */

source/blender/blenkernel/BKE_subdiv_ccg.h

@@ -29,6 +29,10 @@
 #include "BLI_bitmap.h"
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CCGElem;
 struct CCGFace;
 struct CCGKey;
@@ -298,4 +302,8 @@ void BKE_subdiv_ccg_neighbor_coords_get(const SubdivCCG *subdiv_ccg,
                                         const bool include_duplicates,
                                         SubdivCCGNeighbors *r_neighbors);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV_CCG_H__ */

source/blender/blenkernel/BKE_subdiv_deform.h

@@ -26,6 +26,10 @@
 
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 struct Subdiv;
 
@@ -37,4 +41,8 @@ void BKE_subdiv_deform_coarse_vertices(struct Subdiv *subdiv,
                                        float (*vertex_cos)[3],
                                        int num_verts);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV_DEFORM_H__ */

source/blender/blenkernel/BKE_subdiv_eval.h

@@ -26,6 +26,10 @@
 
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 struct Subdiv;
 
@@ -135,4 +139,8 @@ void BKE_subdiv_eval_limit_patch_resolution_point_and_short_normal(struct Subdiv
                                                                    const int normal_offset,
                                                                    const int normal_stride);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV_EVAL_H__ */

source/blender/blenkernel/BKE_subdiv_foreach.h

@@ -26,6 +26,10 @@
 
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 struct Subdiv;
 struct SubdivForeachContext;
@@ -167,4 +171,8 @@ bool BKE_subdiv_foreach_subdiv_geometry(struct Subdiv *subdiv,
                                         const struct SubdivToMeshSettings *mesh_settings,
                                         const struct Mesh *coarse_mesh);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV_FOREACH_H__ */

source/blender/blenkernel/BKE_subdiv_mesh.h

@@ -26,6 +26,10 @@
 
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Mesh;
 struct Subdiv;
 
@@ -46,4 +50,8 @@ struct Mesh *BKE_subdiv_to_mesh(struct Subdiv *subdiv,
                                 const SubdivToMeshSettings *settings,
                                 const struct Mesh *coarse_mesh);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV)MESH_H__ */

source/blender/blenkernel/BKE_subdiv_topology.h

@@ -24,8 +24,16 @@
 #ifndef __BKE_SUBDIV_TOPOLOGY_H__
 #define __BKE_SUBDIV_TOPOLOGY_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Subdiv;
 
 int BKE_subdiv_topology_num_fvar_layers_get(const struct Subdiv *subdiv);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_SUBDIV_TOPOLOGY_H__ */

source/blender/blenkernel/BKE_subsurf.h

@@ -29,6 +29,10 @@
 /* Thread sync primitives used directly.  */
 #include "BLI_threads.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CCGEdge;
 struct CCGElem;
 struct CCGFace;
@@ -159,4 +163,8 @@ void BKE_subsurf_free_unused_buffers(void);
 void BKE_subsurf_osd_cleanup(void);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_tracking.h

@@ -24,6 +24,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Camera;
 struct ImBuf;
 struct ListBase;
@@ -476,4 +480,8 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track(
 
 #define TRACK_AREA_ALL (TRACK_AREA_POINT | TRACK_AREA_PAT | TRACK_AREA_SEARCH)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/BKE_undo_system.h

@@ -20,6 +20,13 @@
  * \ingroup bke
  */
 
+#include "DNA_ID.h"
+#include "DNA_listBase.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 struct UndoStep;
 struct bContext;
@@ -31,9 +38,6 @@ struct Object;
 struct Scene;
 struct Text;
 
-#include "DNA_ID.h"
-#include "DNA_listBase.h"
-
 typedef struct UndoRefID {
   struct ID *ptr;
   char name[MAX_ID_NAME];
@@ -198,4 +202,8 @@ void BKE_undosys_foreach_ID_ref(UndoStack *ustack,
 
 void BKE_undosys_print(UndoStack *ustack);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_UNDO_SYSTEM_H__ */

source/blender/blenkernel/BKE_workspace.h

@@ -23,6 +23,10 @@
 
 #include "BLI_compiler_attrs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 struct bScreen;
 struct bToolRef;
@@ -112,4 +116,8 @@ void BKE_workspace_id_tag_all_visible(struct Main *bmain, int tag) ATTR_NONNULL(
 #undef GETTER_ATTRS
 #undef SETTER_ATTRS
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_WORKSPACE_H__ */

source/blender/blenkernel/BKE_world.h

@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct Main;
 struct World;
@@ -39,4 +43,8 @@ struct World *BKE_world_localize(struct World *wrld);
 void BKE_world_make_local(struct Main *bmain, struct World *wrld, const bool lib_local);
 void BKE_world_eval(struct Depsgraph *depsgraph, struct World *world);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/blender/blenkernel/nla_private.h

@@ -28,6 +28,10 @@
 #include "BLI_bitmap.h"
 #include "BLI_ghash.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* --------------- NLA Evaluation DataTypes ----------------------- */
 
 /* used for list of strips to accumulate at current time */
@@ -177,4 +181,8 @@ void nladata_flush_channels(PointerRNA *ptr,
                             NlaEvalSnapshot *snapshot,
                             const bool flush_to_original);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __NLA_PRIVATE_H__ */

source/blender/blenkernel/particle_private.h

@@ -24,6 +24,10 @@
 #ifndef __PARTICLE_PRIVATE_H__
 #define __PARTICLE_PRIVATE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct ParticleChildModifierContext {
   ParticleThreadContext *thread_ctx;
   ParticleSimulationData *sim;
@@ -65,4 +69,8 @@ void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx,
                         ParticleKey *state,
                         float t);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __PARTICLE_PRIVATE_H__ */

source/blender/blenkernel/tracking_private.h

@@ -29,6 +29,10 @@
 
 #include "BLI_threads.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct GHash;
 struct MovieTracking;
 struct MovieTrackingMarker;
@@ -145,4 +149,8 @@ TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR
                                                    int start_frame);
 void tracking_image_accessor_destroy(TrackingImageAccessor *accessor);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __TRACKING_PRIVATE_H__ */