Refactor: Make all BLI headers .hh C++ ones.

Mainly just boring renaming.

For the cases where there were both C and C++ headers with the same
name, the C one was either:
- Renamed to `_c.hh`.
- Merged into the existing `.hh` header.

Pull Request: https://projects.blender.org/blender/blender/pulls/160019

intern/cycles/blender/curves.cpp

@@ -24,9 +24,9 @@
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math_matrix.h"
-#include "BLI_math_vector.h"
+#include "BLI_listbase.hh"
+#include "BLI_math_matrix_c.hh"
+#include "BLI_math_vector_c.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_curves.hh"

intern/cycles/blender/output_driver.cpp

@@ -4,7 +4,7 @@
 
 #include "blender/output_driver.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "IMB_imbuf_types.hh"
 #include "RE_engine.h"
 

intern/cycles/blender/shader.cpp

@@ -21,7 +21,7 @@
 #include "util/string.h"
 #include "util/task.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "BKE_duplilist.hh"
 #include "BKE_node.hh"

intern/cycles/blender/util.h

@@ -22,7 +22,7 @@
 #include "util/transform.h"
 #include "util/types.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"

intern/ghost/intern/GHOST_XrContext.cc

@@ -14,7 +14,7 @@
 #include <string>
 #include <string_view>
 
-#include "BLI_string.h"
+#include "BLI_string.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
 

intern/ghost/intern/GHOST_utildefines.hh

@@ -5,7 +5,7 @@
 /** \file
  * \ingroup GHOST
  *
- * Utility defines (avoid depending on `BLI_utildefines.h`).
+ * Utility defines (avoid depending on `BLI_utildefines.hh`).
  */
 
 #pragma once

intern/ghost/intern/GHOST_utildefines_variadic.hh

@@ -8,7 +8,7 @@
  * \ingroup bli
  */
 
-/* NOTE: copied from `BLI_utildefines_variadic.h` which would be a bad-level include. */
+/* NOTE: copied from `BLI_utildefines_variadic.hh` which would be a bad-level include. */
 
 /* Over wrapped args. */
 /* clang-format off */

intern/guardedalloc/MEM_guardedalloc.h

@@ -47,8 +47,8 @@
 #define __MEM_GUARDEDALLOC_H__
 
 /* Needed for uintptr_t and attributes, exception, don't use BLI anywhere else in `MEM_*` */
-#include "../../source/blender/blenlib/BLI_compiler_attrs.h"
-#include "../../source/blender/blenlib/BLI_sys_types.h"
+#include "../../source/blender/blenlib/BLI_compiler_attrs.hh"
+#include "../../source/blender/blenlib/BLI_sys_types.hh"
 
 #include <cstring>
 

intern/guardedalloc/intern/mallocn.cc

@@ -12,7 +12,7 @@
 
 #include "PRF_profile.hh"
 /* To ensure strict conversions. */
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
+#include "../../source/blender/blenlib/BLI_strict_flags.hh"
 
 #include <cassert>
 

intern/guardedalloc/intern/mallocn_guarded_impl.cc

@@ -28,7 +28,7 @@
 
 #include "PRF_profile.hh"
 /* to ensure strict conversions */
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
+#include "../../source/blender/blenlib/BLI_strict_flags.hh"
 
 #include "atomic_ops.h"
 #include "mallocn_intern.hh"

intern/guardedalloc/intern/mallocn_inline.hh

@@ -11,7 +11,7 @@
 
 #include <cstdlib>
 
-/* BEGIN copied from BLI_asan.h */
+/* BEGIN copied from BLI_asan.hh */
 
 /* Clang defines this. */
 #ifndef __has_feature
@@ -28,7 +28,7 @@
 #  define ASAN_UNPOISON_MEMORY_REGION(addr, size) (void)(0 && ((size) != 0 && (addr) != NULL))
 #endif
 
-/* END copied from BLI_asan.h */
+/* END copied from BLI_asan.hh */
 
 /**
  * Util to trigger an error for the given memory block.

intern/guardedalloc/intern/mallocn_lockfree_impl.cc

@@ -26,7 +26,7 @@
 #endif
 
 /* to ensure strict conversions */
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
+#include "../../source/blender/blenlib/BLI_strict_flags.hh"
 
 #include "atomic_ops.h"
 #include "mallocn_intern.hh"

intern/guardedalloc/intern/memory_usage.cc

@@ -13,7 +13,7 @@
 #include "MEM_guardedalloc.h"
 #include "mallocn_intern.hh"
 
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
+#include "../../source/blender/blenlib/BLI_strict_flags.hh"
 
 namespace {
 

intern/guardedalloc/tests/guardedalloc_alignment_test.cc

@@ -4,7 +4,7 @@
 
 #include "testing/testing.h"
 
-#include "BLI_utildefines.h"
+#include "BLI_utildefines.hh"
 
 #include "MEM_guardedalloc.h"
 #include "guardedalloc_test_base.h"

intern/mantaflow/intern/MANTA_main.cpp

@@ -21,9 +21,9 @@
 #include "liquid_script.h"
 #include "smoke_script.h"
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.hh"
 #include "BLI_path_utils.hh"
-#include "BLI_utildefines.h"
+#include "BLI_utildefines.hh"
 
 #include "DNA_fluid_types.h"
 #include "DNA_modifier_types.h"

intern/slim/intern/area_compensation.cpp

@@ -6,7 +6,7 @@
  * \ingroup intern_slim
  */
 
-#include "BLI_assert.h"
+#include "BLI_assert.hh"
 
 #include <Eigen/Dense>
 

intern/slim/intern/geometry_data_retrieval.cpp

@@ -10,7 +10,7 @@
 
 #include <Eigen/Dense>
 
-#include "BLI_assert.h"
+#include "BLI_assert.hh"
 
 #include "slim.h"
 #include "slim_matrix_transfer.h"

intern/slim/intern/least_squares_relocator.cpp

@@ -12,7 +12,7 @@
 
 #include <Eigen/Dense>
 
-#include "BLI_assert.h"
+#include "BLI_assert.hh"
 
 namespace slim {
 

intern/slim/intern/slim.cpp

@@ -11,8 +11,8 @@
 #include "doublearea.h"
 #include "flip_avoiding_line_search.h"
 
-#include "BLI_assert.h"
-#include "BLI_math_base.h" /* M_PI */
+#include "BLI_assert.hh"
+#include "BLI_math_base_c.hh" /* M_PI */
 
 #include <vector>
 

source/blender/animrig/intern/action.cc

@@ -11,13 +11,13 @@
 #include "DNA_array_utils.hh"
 #include "DNA_scene_types.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "BLI_map.hh"
-#include "BLI_math_base.h"
-#include "BLI_string.h"
-#include "BLI_string_utf8.h"
+#include "BLI_math_base_c.hh"
+#include "BLI_string.hh"
+#include "BLI_string_utf8.hh"
 #include "BLI_string_utils.hh"
-#include "BLI_utildefines.h"
+#include "BLI_utildefines.hh"
 
 #include "BKE_action.hh"
 #include "BKE_anim_data.hh"

source/blender/animrig/intern/action_iterators.cc

@@ -9,8 +9,8 @@
 #include "ANIM_action.hh"
 #include "ANIM_action_iterators.hh"
 
-#include "BLI_assert.h"
-#include "BLI_listbase.h"
+#include "BLI_assert.hh"
+#include "BLI_listbase.hh"
 
 #include "BKE_anim_data.hh"
 #include "BKE_nla.hh"

source/blender/animrig/intern/action_legacy_test.cc

@@ -13,7 +13,7 @@
 
 #include "DNA_anim_types.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "testing/testing.h"
 

source/blender/animrig/intern/action_runtime.cc

@@ -15,7 +15,7 @@
 #include "BKE_nla.hh"
 #include "BKE_node.hh"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "BLI_set.hh"
 
 #include "ANIM_action.hh"

source/blender/animrig/intern/action_test.cc

@@ -18,8 +18,8 @@
 
 #include "RNA_access.hh"
 
-#include "BLI_string.h"
-#include "BLI_string_utf8.h"
+#include "BLI_string.hh"
+#include "BLI_string_utf8.hh"
 
 #include "DEG_depsgraph_build.hh"
 

source/blender/animrig/intern/anim_rna.cc

@@ -10,9 +10,9 @@
 
 #include "ANIM_rna.hh"
 
-#include "BLI_listbase.h"
-#include "BLI_math_base.h"
-#include "BLI_string.h"
+#include "BLI_listbase.hh"
+#include "BLI_math_base_c.hh"
+#include "BLI_string.hh"
 #include "BLI_vector.hh"
 
 #include "DNA_object_types.h"

source/blender/animrig/intern/animdata.cc

@@ -19,8 +19,8 @@
 
 #include "BLT_translation.hh"
 
-#include "BLI_listbase.h"
-#include "BLI_string_utf8.h"
+#include "BLI_listbase.hh"
+#include "BLI_string_utf8.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"

source/blender/animrig/intern/armature.cc

@@ -11,7 +11,7 @@
 #include "BKE_action.hh"
 #include "BKE_pose.hh"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "DNA_object_types.h"
 

source/blender/animrig/intern/bone_collections.cc

@@ -6,12 +6,12 @@
  * \ingroup animrig
  */
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "BLI_map.hh"
-#include "BLI_string.h"
-#include "BLI_string_utf8.h"
+#include "BLI_string.hh"
+#include "BLI_string_utf8.hh"
 #include "BLI_string_utils.hh"
-#include "BLI_utildefines.h"
+#include "BLI_utildefines.hh"
 
 #include "BLT_translation.hh"
 

source/blender/animrig/intern/bone_collections_test.cc

@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BLI_listbase.h"
-#include "BLI_string.h"
+#include "BLI_listbase.hh"
+#include "BLI_string.hh"
 
 #include "BLT_translation.hh"
 

source/blender/animrig/intern/evaluation_test.cc

@@ -19,7 +19,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
 
-#include "BLI_math_base.h"
+#include "BLI_math_base_c.hh"
 
 #include <optional>
 

source/blender/animrig/intern/fcurve.cc

@@ -13,9 +13,9 @@
 #include "ANIM_animdata.hh"
 #include "ANIM_fcurve.hh"
 #include "BKE_fcurve.hh"
-#include "BLI_math_base.h"
+#include "BLI_math_base_c.hh"
 #include "BLI_math_vector_types.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 #include "DNA_anim_types.h"
 #include "MEM_guardedalloc.h"
 

source/blender/animrig/intern/keyframing.cc

@@ -30,9 +30,9 @@
 
 #include "DNA_scene_types.h"
 
-#include "BLI_math_base.h"
+#include "BLI_math_base_c.hh"
 #include "BLI_task.hh"
-#include "BLI_utildefines.h"
+#include "BLI_utildefines.hh"
 #include "BLT_translation.hh"
 
 #include "DEG_depsgraph.hh"

source/blender/animrig/intern/keyframing_test.cc

@@ -27,8 +27,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
 
-#include "BLI_listbase.h"
-#include "BLI_string.h"
+#include "BLI_listbase.hh"
+#include "BLI_string.hh"
 
 #include "testing/testing.h"
 

source/blender/animrig/intern/keyingsets.cc

@@ -14,8 +14,8 @@
 #include "BKE_main.hh"
 #include "BKE_report.hh"
 
-#include "BLI_listbase.h"
-#include "BLI_string.h"
+#include "BLI_listbase.hh"
+#include "BLI_string.hh"
 
 #include "DEG_depsgraph.hh"
 

source/blender/animrig/intern/nla.cc

@@ -7,7 +7,7 @@
  */
 
 #include "BLI_bit_vector.hh"
-#include "BLI_dynstr.h"
+#include "BLI_dynstr.hh"
 
 #include "BKE_animsys.h"
 #include "BKE_fcurve.hh"

source/blender/animrig/intern/nla_test.cc

@@ -17,7 +17,7 @@
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "testing/testing.h"
 

source/blender/animrig/intern/pose.cc

@@ -10,7 +10,7 @@
 #include "BKE_action.hh"
 #include "BKE_animsys.h"
 #include "BKE_armature.hh"
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
 #include "RNA_access.hh"

source/blender/animrig/intern/pose_test.cc

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "BKE_pose.hh"
-#include "BLI_listbase.h"
-#include "BLI_math_matrix.h"
-#include "BLI_math_rotation.h"
-#include "BLI_string.h"
+#include "BLI_listbase.hh"
+#include "BLI_math_matrix_c.hh"
+#include "BLI_math_rotation_c.hh"
+#include "BLI_string.hh"
 
 #include "BKE_action.hh"
 #include "BKE_anim_data.hh"

source/blender/animrig/intern/versioning.cc

@@ -23,8 +23,8 @@
 #include "BKE_node.hh"
 #include "BKE_report.hh"
 
-#include "BLI_listbase.h"
-#include "BLI_string_utf8.h"
+#include "BLI_listbase.hh"
+#include "BLI_string_utf8.hh"
 
 #include "BLT_translation.hh"
 

source/blender/animrig/intern/versioning_test.cc

@@ -11,7 +11,7 @@
 
 #include "BKE_gtest_base.hh"
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "testing/testing.h"
 

source/blender/animrig/intern/visualkey.cc

@@ -14,8 +14,8 @@
 
 #include "BKE_armature.hh"
 
-#include "BLI_math_matrix.h"
-#include "BLI_math_rotation.h"
+#include "BLI_math_matrix_c.hh"
+#include "BLI_math_rotation_c.hh"
 
 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"

source/blender/asset_system/AS_asset_catalog.hh

@@ -16,7 +16,7 @@
 #include "BLI_function_ref.hh"
 #include "BLI_map.hh"
 #include "BLI_set.hh"
-#include "BLI_uuid.h"
+#include "BLI_uuid.hh"
 #include "BLI_vector.hh"
 
 #include "AS_asset_catalog_path.hh"

source/blender/asset_system/intern/asset_catalog.cc

@@ -16,12 +16,12 @@
 #include "asset_catalog_collection.hh"
 #include "asset_catalog_definition_file.hh"
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.hh"
 #include "BLI_path_utils.hh"
 
 /* For S_ISREG() and S_ISDIR() on Windows. */
 #ifdef WIN32
-#  include "BLI_winstuff.h"
+#  include "BLI_winstuff.hh"
 #endif
 
 #include "asset_library_service.hh"

source/blender/asset_system/intern/asset_library.cc

@@ -18,9 +18,9 @@
 #include "BKE_main.hh"
 #include "BKE_preferences.h"
 
-#include "BLI_listbase.h"  // IWYU pragma: keep
+#include "BLI_listbase.hh"  // IWYU pragma: keep
 #include "BLI_path_utils.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 
 #include "DNA_asset_types.h"
 #include "DNA_space_types.h"

source/blender/asset_system/intern/asset_library_service.cc

@@ -11,7 +11,7 @@
 #include "BKE_blender.hh"
 #include "BKE_preferences.h"
 
-#include "BLI_fileops.h"  // IWYU pragma: keep
+#include "BLI_fileops.hh"  // IWYU pragma: keep
 #include "BLI_path_utils.hh"
 #include "BLI_string_ref.hh"
 

source/blender/asset_system/intern/library_types/common.cc

@@ -6,7 +6,7 @@
  * \ingroup asset_system
  */
 
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 
 #include "DNA_userdef_types.h"
 

source/blender/asset_system/intern/library_types/preferences_on_disk_library.cc

@@ -6,8 +6,8 @@
  * \ingroup asset_system
  */
 
-#include "BLI_assert.h"
-#include "BLI_listbase.h"
+#include "BLI_assert.hh"
+#include "BLI_listbase.hh"
 
 #include "DNA_userdef_types.h"
 

source/blender/asset_system/intern/library_types/remote_library.cc

@@ -8,14 +8,14 @@
 
 #include <fmt/format.h>
 
-#include "BLI_assert.h"
-#include "BLI_fileops.h"
+#include "BLI_assert.hh"
+#include "BLI_fileops.hh"
 #include "BLI_hash_md5.hh"
-#include "BLI_listbase.h"
+#include "BLI_listbase.hh"
 #include "BLI_path_utils.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_threads.h"
+#include "BLI_threads.hh"
 
 #include "BLT_translation.hh"
 

source/blender/asset_system/intern/utils.cc

@@ -7,9 +7,9 @@
  */
 
 /* For PATH_MAX (at least on Windows). */
-#include "BLI_fileops.h"  // IWYU pragma: keep
+#include "BLI_fileops.hh"  // IWYU pragma: keep
 #include "BLI_path_utils.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/asset_system/tests/asset_catalog_test.cc

@@ -9,7 +9,7 @@
 
 #include "BKE_preferences.h"
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.hh"
 #include "BLI_path_utils.hh"
 
 #include "DNA_asset_types.h"

source/blender/asset_system/tests/asset_library_service_test.cc

@@ -4,9 +4,9 @@
 
 #include "asset_library_service.hh"
 
-#include "BLI_fileops.h" /* For PATH_MAX (at least on Windows). */
+#include "BLI_fileops.hh" /* For PATH_MAX (at least on Windows). */
 #include "BLI_path_utils.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 
 #include "BKE_appdir.hh"
 #include "BKE_callbacks.hh"

source/blender/asset_system/tests/asset_library_test_common.hh

@@ -15,7 +15,7 @@
 #include "BKE_appdir.hh"
 #include "BKE_gtest_base.hh"
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.hh"
 #include "BLI_path_utils.hh"
 
 #include "testing/testing.h"

source/blender/asset_system/tests/asset_representation_test.cc

@@ -11,7 +11,7 @@
 #include "BKE_main.hh"
 
 #if defined(WIN32)
-#  include "BLI_string.h"
+#  include "BLI_string.hh"
 #endif
 
 #include "DNA_asset_types.h"

source/blender/blendthumb/src/blender_thumbnailer.cc

@@ -27,13 +27,13 @@
 #ifndef WIN32
 #  include <unistd.h> /* For read close. */
 #else
-#  include "BLI_winstuff.h"
+#  include "BLI_winstuff.hh"
 #  include "winsock2.h"
 #  include <io.h> /* For open close read. */
 #endif
 
-#include "BLI_fileops.h"
-#include "BLI_filereader.h"
+#include "BLI_fileops.hh"
+#include "BLI_filereader.hh"
 #include "BLI_vector.hh"
 
 #include "blendthumb.hh"

source/blender/blendthumb/src/blendthumb_extract.cc

@@ -12,11 +12,11 @@
 #include <cctype>
 #include <cstring>
 
-#include "BLI_alloca.h"
-#include "BLI_endian_defines.h"
-#include "BLI_fileops.h"
-#include "BLI_filereader.h"
-#include "BLI_string.h"
+#include "BLI_alloca.hh"
+#include "BLI_endian_defines.hh"
+#include "BLI_fileops.hh"
+#include "BLI_filereader.hh"
+#include "BLI_string.hh"
 
 #include "BLO_core_bhead.hh"
 #include "BLO_core_blend_header.hh"

source/blender/blendthumb/src/blendthumb_png.cc

@@ -15,8 +15,8 @@
 
 #include "blendthumb.hh"
 
-#include "BLI_endian_defines.h"
-#include "BLI_endian_switch.h"
+#include "BLI_endian_defines.hh"
+#include "BLI_endian_switch.hh"
 #include "BLI_vector.hh"
 
 namespace blender {

source/blender/blendthumb/src/blendthumb_win32.cc

@@ -18,7 +18,7 @@
 
 #include "blendthumb.hh"
 
-#include "BLI_filereader.h"
+#include "BLI_filereader.hh"
 
 #pragma comment(lib, "shlwapi.lib")
 

source/blender/blendthumb/src/thumbnail_provider.mm

@@ -4,8 +4,8 @@
 
 #import <AppKit/NSImage.h>
 
-#include "BLI_fileops.h"
-#include "BLI_filereader.h"
+#include "BLI_fileops.hh"
+#include "BLI_filereader.hh"
 #include "BLI_utility_mixins.hh"
 #include "blendthumb.hh"
 

source/blender/blenfont/BLF_api.hh

@@ -12,10 +12,10 @@
 
 #include "BLI_array.hh"
 #include "BLI_bounds_types.hh"
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "BLI_vector.hh"
 
 #include "DNA_listBase.h"

source/blender/blenfont/intern/blf.cc

@@ -20,10 +20,10 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#include "BLI_fileops.h"
-#include "BLI_math_rotation.h"
+#include "BLI_fileops.hh"
+#include "BLI_math_rotation_c.hh"
 #include "BLI_path_utils.hh"
-#include "BLI_string.h"
+#include "BLI_string.hh"
 
 #include "BLF_api.hh"
 

source/blender/blenfont/intern/blf_default.cc

@@ -10,7 +10,7 @@
 
 #include "DNA_userdef_types.h"
 
-#include "BLI_assert.h"
+#include "BLI_assert.hh"
 
 #include "BLF_api.hh"
 

source/blender/blenfont/intern/blf_dir.cc

@@ -18,8 +18,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_fileops.h"
-#include "BLI_string.h"
+#include "BLI_fileops.hh"
+#include "BLI_string.hh"
 
 #include "blf_internal.hh"
 

source/blender/blenfont/intern/blf_font.cc

@@ -28,15 +28,15 @@
 
 #include "DNA_vec_types.h"
 
-#include "BLI_math_bits.h"
-#include "BLI_math_color_blend.h"
-#include "BLI_math_matrix.h"
+#include "BLI_math_bits.hh"
+#include "BLI_math_color_blend.hh"
+#include "BLI_math_matrix_c.hh"
 #include "BLI_mutex.hh"
 #include "BLI_path_utils.hh"
-#include "BLI_rect.h"
-#include "BLI_string.h"
-#include "BLI_string_cursor_utf8.h"
-#include "BLI_string_utf8.h"
+#include "BLI_rect.hh"
+#include "BLI_string.hh"
+#include "BLI_string_cursor_utf8.hh"
+#include "BLI_string_utf8.hh"
 #include "BLI_vector.hh"
 
 #include "BLF_api.hh"
@@ -48,7 +48,7 @@
 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
 
-#include "BLI_strict_flags.h" /* IWYU pragma: keep. Keep last. */
+#include "BLI_strict_flags.hh" /* IWYU pragma: keep. Keep last. */
 
 namespace blender {
 

source/blender/blenfont/intern/blf_font_default.cc

@@ -12,13 +12,13 @@
 
 #include "BLF_api.hh"
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.hh"
 #include "BLI_path_utils.hh"
 
 #include "BKE_appdir.hh"
 
 #ifdef WIN32
-#  include "BLI_winstuff.h"
+#  include "BLI_winstuff.hh"
 #endif
 
 namespace blender {

source/blender/blenfont/intern/blf_font_win32_compat.cc

@@ -19,8 +19,8 @@
 
 #  include "MEM_guardedalloc.h"
 
-#  include "BLI_fileops.h"
-#  include "BLI_utildefines.h"
+#  include "BLI_fileops.hh"
+#  include "BLI_utildefines.hh"
 
 #  include "blf_internal.hh"
 

source/blender/blenfont/intern/blf_glyph.cc

@@ -25,10 +25,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math_color.h"
-#include "BLI_math_geom.h"
-#include "BLI_rect.h"
+#include "BLI_listbase.hh"
+#include "BLI_math_color_c.hh"
+#include "BLI_math_geom_c.hh"
+#include "BLI_rect.hh"
 
 #include "BLF_api.hh"
 
@@ -37,7 +37,7 @@
 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
 
-#include "BLI_string_utf8.h"
+#include "BLI_string_utf8.hh"
 
 #ifndef WITH_HEADLESS
 #  include "nanosvgrast.h"
@@ -45,7 +45,7 @@
 #  include "svg_icons.h"
 #endif /* WITH_HEADLESS */
 
-#include "BLI_strict_flags.h" /* IWYU pragma: keep. Keep last. */
+#include "BLI_strict_flags.hh" /* IWYU pragma: keep. Keep last. */
 
 namespace blender {
 

source/blender/blenfont/intern/blf_glyph_curves.cc

@@ -19,8 +19,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math_geom.h"
+#include "BLI_listbase.hh"
+#include "BLI_math_geom_c.hh"
 
 #include "BLF_api.hh"
 
@@ -29,9 +29,9 @@
 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
 
-#include "BLI_math_vector.h"
+#include "BLI_math_vector_c.hh"
 
-#include "BLI_strict_flags.h" /* IWYU pragma: keep. Keep last. */
+#include "BLI_strict_flags.hh" /* IWYU pragma: keep. Keep last. */
 
 namespace blender {
 

source/blender/blenfont/intern/blf_thumbs.cc

@@ -20,12 +20,12 @@
 #include FT_TRUETYPE_IDS_H    /* Code-point coverage constants. */
 #include FT_TRUETYPE_TABLES_H /* For TT_OS2 */
 
-#include "BLI_math_bits.h"
-#include "BLI_utildefines.h"
+#include "BLI_math_bits.hh"
+#include "BLI_utildefines.hh"
 
 #include "blf_internal_types.hh"
 
-#include "BLI_strict_flags.h" /* IWYU pragma: keep. Keep last. */
+#include "BLI_strict_flags.hh" /* IWYU pragma: keep. Keep last. */
 
 namespace blender {
 

source/blender/blenkernel/BKE_action.hh

@@ -8,7 +8,7 @@
  * \brief Blender kernel action and pose functionality.
  */
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_span.hh"
 

source/blender/blenkernel/BKE_animsys.h

@@ -12,7 +12,7 @@
 
 #include "BLI_bit_vector.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h" /* for bool */
+#include "BLI_sys_types.hh" /* for bool */
 
 #include <string>
 

source/blender/blenkernel/BKE_appdir.hh

@@ -15,7 +15,7 @@
 #include <optional>
 #include <string>
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_string_ref.hh"
 
 #include "DNA_listBase.h"

source/blender/blenkernel/BKE_asset.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 
 #include "DNA_asset_types.h"
 

source/blender/blenkernel/BKE_attribute.h

@@ -14,7 +14,7 @@
 
 #include "BLI_enum_flags.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 #include "DNA_customdata_types.h"
 

source/blender/blenkernel/BKE_attribute_math.hh

@@ -15,8 +15,8 @@
 #include "BLI_math_axis_angle.hh"
 #include "BLI_math_color.hh"
 #include "BLI_math_quaternion.hh"
-#include "BLI_math_vector.h"
 #include "BLI_math_vector.hh"
+#include "BLI_math_vector_c.hh"
 #include "BLI_offset_indices.hh"
 
 #include "PRF_profile.hh"

source/blender/blenkernel/BKE_blender_copybuffer.hh

@@ -7,7 +7,7 @@
  * \ingroup bke
  */
 
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 namespace blender {
 

source/blender/blenkernel/BKE_ccg.hh

@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include "BLI_assert.h"
+#include "BLI_assert.hh"
 #include "BLI_math_vector_types.hh"
 
 struct CCGSubSurf;

source/blender/blenkernel/BKE_collection.hh

@@ -10,10 +10,10 @@
 
 #include <string>
 
-#include "BLI_iterator.h"
+#include "BLI_iterator.hh"
 #include "BLI_map.hh"
 #include "BLI_set.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 #include "DNA_collection_types.h"
 #include "DNA_listBase.h"

source/blender/blenkernel/BKE_constraint.h

@@ -50,7 +50,7 @@ struct bConstraintOb {
   short type;
   /**
    * Rotation order for constraint owner
-   * (as defined in #eEulerRotationOrders in BLI_math_rotation.h).
+   * (as defined in #eEulerRotationOrders in BLI_math_rotation_c.hh).
    */
   short rotOrder;
 };

source/blender/blenkernel/BKE_cryptomatte.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "DNA_layer_types.h"
 
 namespace blender {

source/blender/blenkernel/BKE_curve.hh

@@ -15,7 +15,7 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"

source/blender/blenkernel/BKE_customdata.hh

@@ -12,11 +12,11 @@
 #include <optional>
 
 #include "BLI_generic_virtual_array.hh"
-#include "BLI_implicit_sharing.h"
+#include "BLI_implicit_sharing.hh"
 #include "BLI_memory_counter_fwd.hh"
 #include "BLI_span.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "BLI_vector.hh"
 
 #include "BKE_volume_enums.hh"
@@ -446,7 +446,7 @@ void CustomData_bmesh_interp(
 void CustomData_swap_corners(CustomData *data, int index, const int *corner_indices);
 
 /**
- * Custom data layers can be shared through implicit sharing (`BLI_implicit_sharing.h`). This
+ * Custom data layers can be shared through implicit sharing (`BLI_implicit_sharing.hh`). This
  * function makes sure that the layer is unshared if it was shared, which makes it mutable.
  */
 void CustomData_ensure_data_is_mutable(CustomDataLayer *layer, int totelem);

source/blender/blenkernel/BKE_icons.hh

@@ -17,9 +17,9 @@
 
 #include <optional>
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 #include "DNA_ID_enums.h"
 

source/blender/blenkernel/BKE_idprop.hh

@@ -14,11 +14,11 @@
 #include "DNA_ID.h"
 #include "DNA_ID_enums.h"
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_span.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "BLI_vector_set.hh"
 
 namespace blender {

source/blender/blenkernel/BKE_idtype.hh

@@ -15,7 +15,7 @@
 #include "BLI_color_types.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_implicit_sharing_ptr.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 #include "DNA_ID.h"
 

source/blender/blenkernel/BKE_image.hh

@@ -9,7 +9,7 @@
 
 #include "DNA_listBase.h"
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_mutex.hh"
 #include "BLI_string_ref.hh"

source/blender/blenkernel/BKE_image_wrappers.hh

@@ -10,8 +10,8 @@
 
 #include "DNA_image_types.h"
 
-#include "BLI_math_color.h"
-#include "BLI_math_vector.h"
+#include "BLI_math_color_c.hh"
+#include "BLI_math_vector_c.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_memory_utils.hh"
 

source/blender/blenkernel/BKE_keyconfig.h

@@ -7,7 +7,7 @@
  * \ingroup bke
  */
 
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 namespace blender {
 

source/blender/blenkernel/BKE_lattice.hh

@@ -12,7 +12,7 @@
 
 #include "BLI_array.hh"
 #include "BLI_bounds_types.hh"
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"

source/blender/blenkernel/BKE_lib_id.hh

@@ -32,7 +32,7 @@
 
 #include <optional>
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_enum_flags.hh"
 #include "BLI_set.hh"
 #include "BLI_string_ref.hh"

source/blender/blenkernel/BKE_lib_remap.hh

@@ -20,7 +20,7 @@
  * - `BKE_lib_remap_callback_` should be used for functions managing remapping callbacks.
  */
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_enum_flags.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_map.hh"

source/blender/blenkernel/BKE_light.h

@@ -9,7 +9,7 @@
  * \brief General operations, lookup, etc. for blender lights.
  */
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 

source/blender/blenkernel/BKE_lightprobe.h

@@ -9,7 +9,7 @@
  * \brief General operations for probes.
  */
 
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 
 namespace blender {
 

source/blender/blenkernel/BKE_main.hh

@@ -25,11 +25,11 @@
 
 #include "DNA_listBase.h"
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_map.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_set.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "BLI_utility_mixins.hh"
 #include "BLI_vector_set.hh"
 

source/blender/blenkernel/BKE_main_idmap.hh

@@ -17,8 +17,8 @@
  * - `BKE_main_idmap_` Should be used for functions in that file.
  */
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_sys_types.h"
+#include "BLI_compiler_attrs.hh"
+#include "BLI_sys_types.hh"
 
 namespace blender {
 

source/blender/blenkernel/BKE_main_namemap.hh

@@ -18,7 +18,7 @@
  * - `BKE_main_namemap_` Should be used for functions in this file.
  */
 
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_string_ref.hh"
 
 namespace blender {

source/blender/blenkernel/BKE_mesh_remap.hh

@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include "BLI_math_matrix.h"
+#include "BLI_math_matrix_c.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 

source/blender/blenkernel/BKE_modifier.hh

@@ -6,7 +6,7 @@
 /** \file
  * \ingroup bke
  */
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_enum_flags.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_math_matrix_types.hh"

source/blender/blenkernel/BKE_node.hh

@@ -10,7 +10,7 @@
 
 #include <optional>
 
-#include "BLI_compiler_compat.h"
+#include "BLI_compiler_compat.hh"
 #include "BLI_span.hh"
 
 #include "BKE_node_socket_value_fwd.hh"

source/blender/blenkernel/BKE_object.hh

@@ -12,11 +12,11 @@
 #include <optional>
 
 #include "BLI_bounds_types.hh"
-#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_attrs.hh"
 #include "BLI_function_ref.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
-#include "BLI_sys_types.h"
+#include "BLI_sys_types.hh"
 #include "BLI_vector.hh"
 
 #include "DNA_object_enums.h"

source/blender/blenkernel/BKE_paint_bvh_pixels.hh

@@ -11,7 +11,7 @@
 #include "BLI_array.hh"
 #include "BLI_map.hh"
 #include "BLI_math_vector.hh"
-#include "BLI_rect.h"
+#include "BLI_rect.hh"
 #include "BLI_vector.hh"
 
 #include "DNA_image_types.h"