Cleanup: Move four blenkernel headers to C++

source/blender/blenkernel/BKE_shrinkwrap.hh

@@ -11,10 +11,6 @@
 #include "BKE_bvhutils.hh"
 #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.
  *
@@ -218,7 +214,3 @@ void BKE_shrinkwrap_snap_point_to_surface(const struct ShrinkwrapTreeData *tree,
   { \
     0, \
   }
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_unit.hh

@@ -4,14 +4,12 @@
 
 #pragma once
 
+#include "BLI_sys_types.h"
+
 /** \file
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct UnitSettings;
 
 /* In all cases the value is assumed to be scaled by the user-preference. */
@@ -120,7 +118,3 @@ enum {
   B_UNIT_TEMPERATURE = 12,
   B_UNIT_TYPE_TOT = 13,
 };
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_vfont.hh

@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
+#include "BLI_sys_types.h"
+
 /** \file
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct CharInfo;
 struct Curve;
 struct Main;
@@ -132,7 +130,3 @@ void BKE_vfont_clipboard_get(char32_t **r_text_buf,
                              struct CharInfo **r_info_buf,
                              size_t *r_len_utf8,
                              size_t *r_len_utf32);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/BKE_vfontdata.hh

@@ -12,10 +12,6 @@
 
 #include "DNA_listBase.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct PackedFile;
 struct VFont;
 
@@ -45,7 +41,3 @@ VFontData *BKE_vfontdata_copy(const VFontData *vfont_src, int flag);
 
 VChar *BKE_vfontdata_char_from_freetypefont(struct VFont *vfont, unsigned long character);
 VChar *BKE_vfontdata_char_copy(const VChar *vchar_src);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/CMakeLists.txt

@@ -481,7 +481,7 @@ set(SRC
   BKE_screen.hh
   BKE_sequencer_offscreen.h
   BKE_shader_fx.h
-  BKE_shrinkwrap.h
+  BKE_shrinkwrap.hh
   BKE_softbody.h
   BKE_sound.h
   BKE_speaker.h
@@ -501,9 +501,9 @@ set(SRC
   BKE_tracking.h
   BKE_type_conversions.hh
   BKE_undo_system.h
-  BKE_unit.h
-  BKE_vfont.h
-  BKE_vfontdata.h
+  BKE_unit.hh
+  BKE_vfont.hh
+  BKE_vfontdata.hh
   BKE_viewer_path.hh
   BKE_volume.hh
   BKE_volume_openvdb.hh

source/blender/blenkernel/intern/DerivedMesh.cc

@@ -60,7 +60,7 @@
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 

source/blender/blenkernel/intern/bpath.cc

@@ -63,7 +63,7 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BKE_bpath.h" /* own include */
 

source/blender/blenkernel/intern/constraint.cc

@@ -66,7 +66,7 @@
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_scene.h"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 #include "BKE_tracking.h"
 
 #include "BIK_api.h"

source/blender/blenkernel/intern/curve.cc

@@ -51,7 +51,7 @@
 #include "BKE_main.h"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/curve_convert.cc

@@ -16,7 +16,7 @@
 #include "BKE_displist.h"
 #include "BKE_lib_id.h"
 #include "BKE_modifier.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/displist.cc

@@ -41,7 +41,7 @@
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BLI_sys_types.h" /* For #intptr_t support. */
 

source/blender/blenkernel/intern/gpencil_modifier_legacy.cc

@@ -42,7 +42,7 @@
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_screen.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/material.cc

@@ -68,7 +68,7 @@
 #include "BKE_object_types.hh"
 #include "BKE_preview_image.hh"
 #include "BKE_scene.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"

source/blender/blenkernel/intern/mesh_runtime.cc

@@ -25,7 +25,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
 #include "BKE_mesh_runtime.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 #include "BKE_subdiv_ccg.hh"
 
 using blender::float3;

source/blender/blenkernel/intern/object.cc

@@ -129,7 +129,7 @@
 #include "BKE_speaker.h"
 #include "BKE_subdiv_ccg.hh"
 #include "BKE_subsurf.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 #include "BKE_volume.hh"
 
 #include "DEG_depsgraph.hh"

source/blender/blenkernel/intern/object_dupli.cc

@@ -59,7 +59,7 @@
 #include "BKE_particle.h"
 #include "BKE_scene.h"
 #include "BKE_type_conversions.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/packedFile.cc

@@ -34,7 +34,7 @@
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
 #include "BKE_sound.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 #include "BKE_volume.hh"
 
 #include "IMB_imbuf.h"

source/blender/blenkernel/intern/scene.cc

@@ -88,7 +88,7 @@
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
 #include "BKE_sound.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 #include "BKE_workspace.h"
 #include "BKE_world.h"
 

source/blender/blenkernel/intern/shrinkwrap.cc

@@ -33,7 +33,7 @@
 #include "BKE_lattice.hh"
 #include "BKE_lib_id.h"
 #include "BKE_modifier.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 
 #include "BKE_deform.h"
 #include "BKE_editmesh.hh"

source/blender/blenkernel/intern/unit.cc

@@ -20,7 +20,7 @@
 
 #include "DNA_scene_types.h"
 
-#include "BKE_unit.h" /* own include */
+#include "BKE_unit.hh" /* own include */
 
 #ifdef WIN32
 #  include "BLI_winstuff.h"

source/blender/blenkernel/intern/vfont.cc

@@ -44,8 +44,8 @@
 #include "BKE_main.h"
 #include "BKE_object_types.hh"
 #include "BKE_packedFile.h"
-#include "BKE_vfont.h"
-#include "BKE_vfontdata.h"
+#include "BKE_vfont.hh"
+#include "BKE_vfontdata.hh"
 
 #include "BLO_read_write.hh"
 

source/blender/blenkernel/intern/vfontdata_freetype.cc

@@ -22,8 +22,8 @@
 #include "BLI_string_utf8.h"
 
 #include "BKE_curve.hh"
-#include "BKE_vfont.h"
-#include "BKE_vfontdata.h"
+#include "BKE_vfont.hh"
+#include "BKE_vfontdata.hh"
 
 #include "DNA_packedFile_types.h"
 #include "DNA_vfont_types.h"

source/blender/blenloader/intern/versioning_280.cc

@@ -90,7 +90,7 @@
 #include "BKE_rigidbody.h"
 #include "BKE_screen.hh"
 #include "BKE_studiolight.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 #include "BKE_workspace.h"
 
 #include "SEQ_iterator.hh"

source/blender/blenloader/tests/blendfile_loading_base_test.cc

@@ -18,7 +18,7 @@
 #include "BKE_modifier.hh"
 #include "BKE_node.hh"
 #include "BKE_scene.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BLF_api.h"
 

source/blender/depsgraph/intern/builder/deg_builder_relations.cc

@@ -79,7 +79,7 @@
 #include "BKE_pointcache.h"
 #include "BKE_rigidbody.h"
 #include "BKE_shader_fx.h"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 #include "BKE_sound.h"
 #include "BKE_tracking.h"
 #include "BKE_world.h"

source/blender/draw/engines/overlay/overlay_edit_text.cc

@@ -13,7 +13,7 @@
 #include "BLI_math_color.h"
 #include "BLI_math_rotation.h"
 
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DNA_curve_types.h"
 

source/blender/draw/intern/draw_cache_impl_curve.cc

@@ -26,7 +26,7 @@
 #include "BKE_displist.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_object_types.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "GPU_batch.h"
 #include "GPU_capabilities.h"

source/blender/draw/intern/draw_manager_text.cc

@@ -22,7 +22,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_object.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"

source/blender/editors/animation/anim_markers.cc

@@ -26,7 +26,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"

source/blender/editors/armature/pose_slide.cc

@@ -51,7 +51,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"

source/blender/editors/curve/editfont.cc

@@ -34,7 +34,7 @@
 #include "BKE_main.h"
 #include "BKE_object.hh"
 #include "BKE_report.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BLI_string_utf8.h"
 

source/blender/editors/curve/editfont_undo.cc

@@ -24,7 +24,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_undo_system.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 

source/blender/editors/interface/eyedroppers/eyedropper_depth.cc

@@ -25,7 +25,7 @@
 #include "BKE_context.hh"
 #include "BKE_lib_id.h"
 #include "BKE_screen.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"

source/blender/editors/interface/interface.cc

@@ -39,7 +39,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_asset.hh"
 

source/blender/editors/interface/interface_handlers.cc

@@ -46,7 +46,7 @@
 #include "BKE_report.h"
 #include "BKE_screen.hh"
 #include "BKE_tracking.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "GHOST_C-api.h"
 

source/blender/editors/mesh/editmesh_bevel.cc

@@ -20,7 +20,7 @@
 #include "BKE_editmesh.hh"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_curveprofile_types.h"
 #include "DNA_mesh_types.h"

source/blender/editors/mesh/editmesh_inset.cc

@@ -20,7 +20,7 @@
 #include "BKE_editmesh.hh"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"

source/blender/editors/mesh/editmesh_knife.cc

@@ -39,7 +39,7 @@
 #include "BKE_layer.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"

source/blender/editors/mesh/editmesh_loopcut.cc

@@ -22,7 +22,7 @@
 #include "BKE_layer.h"
 #include "BKE_modifier.hh"
 #include "BKE_report.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "UI_interface.hh"
 

source/blender/editors/mesh/editmesh_mask_extract.cc

@@ -22,7 +22,7 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 #include "BKE_screen.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 
 #include "BLI_math_vector.h"
 

source/blender/editors/object/object_add.cc

@@ -87,7 +87,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_speaker.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 #include "BKE_volume.hh"
 
 #include "DEG_depsgraph.hh"

source/blender/editors/object/object_remesh.cc

@@ -41,8 +41,8 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_shrinkwrap.h"
-#include "BKE_unit.h"
+#include "BKE_shrinkwrap.hh"
+#include "BKE_unit.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"

source/blender/editors/render/render_shading.cc

@@ -55,7 +55,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 #include "BKE_workspace.h"
 #include "BKE_world.h"
 

source/blender/editors/space_graph/graph_buttons.cc

@@ -33,7 +33,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_screen.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"

source/blender/editors/space_view3d/view3d_draw.cc

@@ -32,7 +32,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_studiolight.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "BLF_api.h"
 

source/blender/editors/space_view3d/view3d_gizmo_ruler.cc

@@ -26,7 +26,7 @@
 #include "BKE_material.h"
 #include "BKE_object.hh"
 #include "BKE_scene.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_meshdata_types.h"

source/blender/editors/space_view3d/view3d_navigate.cc

@@ -29,7 +29,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_axis.cc

@@ -25,7 +25,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_camera.cc

@@ -23,7 +23,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc

@@ -24,7 +24,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc

@@ -24,7 +24,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc

@@ -25,7 +25,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/space_view3d/view3d_navigate_view_pan.cc

@@ -23,7 +23,7 @@
 #include "BKE_paint.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/editors/transform/transform_mode_baketime.cc

@@ -12,7 +12,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_bbone_resize.cc

@@ -13,7 +13,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_bend.cc

@@ -20,7 +20,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_boneenvelope.cc

@@ -12,7 +12,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_boneroll.cc

@@ -13,7 +13,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_curveshrinkfatten.cc

@@ -13,7 +13,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_customdata.cc

@@ -13,7 +13,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_edge_rotate_normal.cc

@@ -15,7 +15,7 @@
 #include "BKE_context.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_mesh.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_edge_seq_slide.cc

@@ -14,7 +14,7 @@
 #include "BLI_math_vector.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_edge_slide.cc

@@ -18,7 +18,7 @@
 #include "BKE_context.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_editmesh_bvh.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"

source/blender/editors/transform/transform_mode_gpopacity.cc

@@ -12,7 +12,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_gpencil_legacy_types.h"
 

source/blender/editors/transform/transform_mode_gpshrinkfatten.cc

@@ -12,7 +12,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_gpencil_legacy_types.h"
 

source/blender/editors/transform/transform_mode_maskshrinkfatten.cc

@@ -12,7 +12,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_push_pull.cc

@@ -14,7 +14,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_resize.cc

@@ -16,7 +16,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_image.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_rotate.cc

@@ -15,7 +15,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_report.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_shear.cc

@@ -16,7 +16,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_shrink_fatten.cc

@@ -14,7 +14,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_report.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_skin_resize.cc

@@ -13,7 +13,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_tilt.cc

@@ -13,7 +13,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_timescale.cc

@@ -15,7 +15,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_nla.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_timeslide.cc

@@ -17,7 +17,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_nla.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_timetranslate.cc

@@ -14,7 +14,7 @@
 #include "BLI_string.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_tosphere.cc

@@ -16,7 +16,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_trackball.cc

@@ -15,7 +15,7 @@
 #include "BLI_task.h"
 
 #include "BKE_context.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_screen.hh"
 

source/blender/editors/transform/transform_mode_translate.cc

@@ -21,7 +21,7 @@
 #include "BKE_context.hh"
 #include "BKE_image.h"
 #include "BKE_report.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "ED_node.hh"
 #include "ED_screen.hh"

source/blender/editors/transform/transform_mode_vert_slide.cc

@@ -15,7 +15,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"

source/blender/editors/util/numinput.cc

@@ -20,7 +20,7 @@
 #include "BKE_context.hh"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "DNA_scene_types.h"
 

source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc

@@ -32,7 +32,7 @@
 #include "BKE_modifier.hh"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/makesrna/intern/rna_ID.cc

@@ -225,7 +225,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = {
 #  include "BKE_library.h"
 #  include "BKE_material.h"
 #  include "BKE_preview_image.hh"
-#  include "BKE_vfont.h"
+#  include "BKE_vfont.hh"
 
 #  include "DEG_depsgraph.hh"
 #  include "DEG_depsgraph_build.hh"

source/blender/makesrna/intern/rna_curve.cc

@@ -155,7 +155,7 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
 #  include "BKE_curve.hh"
 #  include "BKE_curveprofile.h"
 #  include "BKE_main.h"
-#  include "BKE_vfont.h"
+#  include "BKE_vfont.hh"
 
 #  include "DEG_depsgraph.hh"
 #  include "DEG_depsgraph_build.hh"

source/blender/makesrna/intern/rna_main_api.cc

@@ -57,7 +57,7 @@
 #  include "BKE_speaker.h"
 #  include "BKE_text.h"
 #  include "BKE_texture.h"
-#  include "BKE_vfont.h"
+#  include "BKE_vfont.hh"
 #  include "BKE_volume.hh"
 #  include "BKE_workspace.h"
 #  include "BKE_world.h"

source/blender/makesrna/intern/rna_object_api.cc

@@ -66,7 +66,7 @@ static const EnumPropertyItem space_items[] = {
 #  include "BKE_object.hh"
 #  include "BKE_object_types.hh"
 #  include "BKE_report.h"
-#  include "BKE_vfont.h"
+#  include "BKE_vfont.hh"
 
 #  include "ED_object.hh"
 #  include "ED_screen.hh"

source/blender/makesrna/intern/rna_scene.cc

@@ -740,7 +740,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = {
 #  include "BKE_pointcache.h"
 #  include "BKE_scene.h"
 #  include "BKE_screen.hh"
-#  include "BKE_unit.h"
+#  include "BKE_unit.hh"
 
 #  include "NOD_composite.hh"
 

source/blender/makesrna/intern/rna_vfont.cc

@@ -18,7 +18,7 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "BKE_vfont.h"
+#  include "BKE_vfont.hh"
 #  include "DNA_object_types.h"
 
 #  include "DEG_depsgraph.hh"

source/blender/modifiers/intern/MOD_shrinkwrap.cc

@@ -25,7 +25,7 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_screen.hh"
-#include "BKE_shrinkwrap.h"
+#include "BKE_shrinkwrap.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"

source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc

@@ -9,7 +9,7 @@
 #include "BKE_curve_legacy_convert.hh"
 #include "BKE_curves.hh"
 #include "BKE_instances.hh"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BLI_bounds.hh"
 #include "BLI_hash.h"

source/blender/python/intern/bpy_utils_units.cc

@@ -23,14 +23,14 @@
 #include "../generic/py_capi_utils.h"
 #include "../generic/python_compat.h"
 
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 /***** C-defined systems and types *****/
 
 static PyTypeObject BPyUnitsSystemsType;
 static PyTypeObject BPyUnitsCategoriesType;
 
-/* XXX: Maybe better as `extern` of `BKE_unit.h` ? */
+/* XXX: Maybe better as `extern` of `BKE_unit.hh` ? */
 static const char *bpyunits_usystem_items[] = {
     "NONE",
     "METRIC",
@@ -62,7 +62,7 @@ BLI_STATIC_ASSERT(
 /**
  * These fields are just empty placeholders, actual values get set in initializations functions.
  * This allows us to avoid many handwriting, and above all,
- * to keep all systems/categories definition stuff in `BKE_unit.h`.
+ * to keep all systems/categories definition stuff in `BKE_unit.hh`.
  */
 static PyStructSequence_Field bpyunits_systems_fields[ARRAY_SIZE(bpyunits_usystem_items)];
 static PyStructSequence_Field bpyunits_categories_fields[ARRAY_SIZE(bpyunits_ucategories_items)];

source/blender/windowmanager/intern/wm_init_exit.cc

@@ -50,7 +50,7 @@
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
 #include "BKE_sound.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 
 #include "BKE_addon.h"
 #include "BKE_appdir.h"

source/blender/windowmanager/intern/wm_operators.cc

@@ -61,7 +61,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh" /* BKE_ST_MAXNAME */
-#include "BKE_unit.h"
+#include "BKE_unit.hh"
 
 #include "BKE_idtype.h"
 

source/creator/creator.cc

@@ -54,7 +54,7 @@
 #include "BKE_particle.h"
 #include "BKE_shader_fx.h"
 #include "BKE_sound.h"
-#include "BKE_vfont.h"
+#include "BKE_vfont.hh"
 #include "BKE_volume.hh"
 
 #ifndef WITH_PYTHON_MODULE