Cleanup: reduce amount of math-related includes

Using ClangBuildAnalyzer on the whole Blender build, it was pointing out that BLI_math.h is the heaviest "header hub" (i.e. non tiny file that is included a lot). However, there's very little (actually zero) source files in Blender that need "all the math" (base, colors, vectors, matrices, quaternions, intersection, interpolation, statistics, solvers and time). A common use case is source files needing just vectors, or just vectors & matrices, or just colors etc. Actually, 181 files were including the whole math thing without needing it at all. This change removes BLI_math.h completely, and instead in all the places that need it, includes BLI_math_vector.h or BLI_math_color.h and so on. Change from that: - BLI_math_color.h was included 1399 times -> now 408 (took 114.0sec to parse -> now 36.3sec) - BLI_simd.h 1403 -> 418 (109.7sec -> 34.9sec). Full rebuild of Blender (Apple M1, Xcode, RelWithDebInfo) is not affected much (342sec -> 334sec). Most of benefit would be when someone's changing BLI_simd.h or BLI_math_color.h or similar files, that now there's 3x fewer files result in a recompile. Pull Request #110944
2023-08-09 11:39:20 +03:00 · 2023-08-09 11:39:20 +03:00 · d973355b3a
commit d973355b3a
parent 09d2108bf5
912 changed files with 1476 additions and 918 deletions
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@ -21,7 +21,6 @@ using namespace OCIO_NAMESPACE;

 #include "MEM_guardedalloc.h"

-#include "BLI_math.h"
 #include "BLI_math_color.h"
 #include "BLI_math_matrix.h"

--- a/source/blender/blenfont/intern/blf.cc
+++ b/source/blender/blenfont/intern/blf.cc
@ -23,7 +23,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_fileops.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_threads.h"
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@ -29,8 +29,8 @@
 #include "DNA_vec_types.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
 #include "BLI_math_color_blend.h"
+#include "BLI_math_matrix.h"
 #include "BLI_path_util.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@ -4,6 +4,8 @@

 #pragma once

+#include "BLI_rect.h"
+
 /** \file
 * \ingroup bke
 * \brief Camera data-block and utility functions.
@ -20,7 +22,6 @@ struct RegionView3D;
 struct RenderData;
 struct Scene;
 struct View3D;
-struct rctf;

 /* Camera Data-block */

--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@ -46,7 +46,8 @@ typedef struct bConstraintOb {

  /** type of owner. */
  short type;
-  /** rotation order for constraint owner (as defined in #eEulerRotationOrders in BLI_math.h) */
+  /** rotation order for constraint owner (as defined in #eEulerRotationOrders in
+   * BLI_math_rotation.h) */
  short rotOrder;
 } bConstraintOb;

--- a/source/blender/blenkernel/BKE_image_wrappers.hh
+++ b/source/blender/blenkernel/BKE_image_wrappers.hh
@ -10,7 +10,8 @@

 #include "DNA_image_types.h"

-#include "BLI_math.h"
+#include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"

 #include "IMB_imbuf_types.h"
--- a/source/blender/blenkernel/BKE_kelvinlet.h
+++ b/source/blender/blenkernel/BKE_kelvinlet.h
@ -7,8 +7,6 @@
 * \ingroup bke
 */

-#include "BLI_math.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/source/blender/blenkernel/BKE_mesh_remap.hh
+++ b/source/blender/blenkernel/BKE_mesh_remap.hh
@ -8,6 +8,8 @@
 * \ingroup bke
 */

+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"

--- a/source/blender/blenkernel/BKE_pbvh_pixels.hh
+++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh
@ -6,7 +6,6 @@

 #include <functional>

-#include "BLI_math.h"
 #include "BLI_math_vector.hh"
 #include "BLI_rect.h"
 #include "BLI_vector.hh"
--- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h
@ -8,6 +8,8 @@

 #pragma once

+#include <math.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc
@ -9,7 +9,6 @@
 #include "BLI_sys_types.h" /* for intptr_t support */
 #include "MEM_guardedalloc.h"

-#include "BLI_math.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h" /* for BLI_assert */

--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@ -24,7 +24,8 @@
 #include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.h"
 #include "BLI_task.hh"
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@ -24,7 +24,10 @@

 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
-#include "BLI_math.h"
+#include "BLI_math_color.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_session_uuid.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/action_mirror.cc
+++ b/source/blender/blenkernel/intern/action_mirror.cc
@ -18,7 +18,8 @@
 #include "DNA_object_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/anim_path.cc
+++ b/source/blender/blenkernel/intern/anim_path.cc
@ -14,6 +14,7 @@
 #include "DNA_key_types.h"
 #include "DNA_object_types.h"

+#include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"

 #include "BKE_anim_path.h"
--- a/source/blender/blenkernel/intern/armature.cc
+++ b/source/blender/blenkernel/intern/armature.cc
@ -18,7 +18,10 @@
 #include "BLI_alloca.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/armature_deform.cc
+++ b/source/blender/blenkernel/intern/armature_deform.cc
@ -18,7 +18,9 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/armature_test.cc
+++ b/source/blender/blenkernel/intern/armature_test.cc
@ -5,7 +5,9 @@
 #include "BKE_armature.hh"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"

 #include "DNA_armature_types.h"

--- a/source/blender/blenkernel/intern/armature_update.cc
+++ b/source/blender/blenkernel/intern/armature_update.cc
@ -9,7 +9,9 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "DNA_armature_types.h"
--- a/source/blender/blenkernel/intern/blendfile_link_append.cc
+++ b/source/blender/blenkernel/intern/blendfile_link_append.cc
@ -29,7 +29,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/boids.cc
+++ b/source/blender/blenkernel/intern/boids.cc
@ -16,7 +16,8 @@

 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/brush.cc
+++ b/source/blender/blenkernel/intern/brush.cc
@ -16,7 +16,7 @@
 #include "DNA_scene_types.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
 #include "BLI_rand.h"

 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/bvhutils.cc
+++ b/source/blender/blenkernel/intern/bvhutils.cc
@ -16,7 +16,8 @@

 #include "BLI_bit_vector.hh"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_span.hh"
 #include "BLI_task.h"
 #include "BLI_threads.h"
--- a/source/blender/blenkernel/intern/camera.cc
+++ b/source/blender/blenkernel/intern/camera.cc
@ -21,7 +21,9 @@
 #include "DNA_view3d_types.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/cdderivedmesh.cc
+++ b/source/blender/blenkernel/intern/cdderivedmesh.cc
@ -14,7 +14,6 @@

 #include "atomic_ops.h"

-#include "BLI_math.h"
 #include "BLI_utildefines.h"

 #include "BKE_DerivedMesh.h"
--- a/source/blender/blenkernel/intern/cloth.cc
+++ b/source/blender/blenkernel/intern/cloth.cc
@ -16,7 +16,10 @@

 #include "BLI_edgehash.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/collision.cc
+++ b/source/blender/blenkernel/intern/collision.cc
@ -19,7 +19,8 @@
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/colorband.cc
+++ b/source/blender/blenkernel/intern/colorband.cc
@ -9,8 +9,8 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_heap.h"
-#include "BLI_math.h"
 #include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "DNA_key_types.h"
--- a/source/blender/blenkernel/intern/colortools.cc
+++ b/source/blender/blenkernel/intern/colortools.cc
@ -17,7 +17,6 @@
 #include "DNA_curve_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/constraint.cc
+++ b/source/blender/blenkernel/intern/constraint.cc
@ -20,7 +20,9 @@
 #include "BLI_blenlib.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/crazyspace.cc
+++ b/source/blender/blenkernel/intern/crazyspace.cc
@ -16,6 +16,8 @@

 #include "BLI_bitmap.h"
 #include "BLI_linklist.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
 #include "BLI_utildefines.h"

 #include "BKE_DerivedMesh.h"
--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@ -16,7 +16,11 @@
 #include "BLI_endian_switch.h"
 #include "BLI_ghash.h"
 #include "BLI_index_range.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_solvers.h"
+#include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/curve_decimate.cc
+++ b/source/blender/blenkernel/intern/curve_decimate.cc
@ -20,6 +20,8 @@ extern "C" {

 #include "BLI_strict_flags.h"

+#include <string.h>
+
 struct Knot {
  Knot *next, *prev;
  uint point_index; /* Index in point array. */
--- a/source/blender/blenkernel/intern/curve_deform.cc
+++ b/source/blender/blenkernel/intern/curve_deform.cc
@ -13,7 +13,9 @@
 #include <cstdlib>
 #include <cstring>

-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "DNA_curve_types.h"
--- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc
+++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc
@ -5,6 +5,7 @@
 #include "BLI_array.hh"
 #include "BLI_array_utils.hh"
 #include "BLI_math_matrix.hh"
+#include "BLI_math_rotation.h"
 #include "BLI_set.hh"
 #include "BLI_task.hh"

--- a/source/blender/blenkernel/intern/curveprofile.cc
+++ b/source/blender/blenkernel/intern/curveprofile.cc
@ -13,6 +13,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_curveprofile_types.h"

+#include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 #include "BLI_rect.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@ -23,7 +23,6 @@
 #include "BLI_color.hh"
 #include "BLI_endian_switch.h"
 #include "BLI_index_range.hh"
-#include "BLI_math.h"
 #include "BLI_math_color_blend.h"
 #include "BLI_math_quaternion_types.hh"
 #include "BLI_math_vector.hh"
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@ -15,7 +15,7 @@
 #include "DNA_scene_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
 #include "BLI_utildefines.h"

 #include "BKE_attribute.h"
--- a/source/blender/blenkernel/intern/deform.cc
+++ b/source/blender/blenkernel/intern/deform.cc
@ -22,7 +22,7 @@
 #include "DNA_scene_types.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@ -22,7 +22,7 @@
 #include "BLI_index_range.hh"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
 #include "BLI_memarena.h"
 #include "BLI_scanfill.h"
 #include "BLI_span.hh"
--- a/source/blender/blenkernel/intern/dynamicpaint.cc
+++ b/source/blender/blenkernel/intern/dynamicpaint.cc
@ -13,7 +13,10 @@

 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
-#include "BLI_math.h"
+#include "BLI_math_color.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
--- a/source/blender/blenkernel/intern/editmesh.cc
+++ b/source/blender/blenkernel/intern/editmesh.cc
@ -13,7 +13,8 @@
 #include "DNA_object_types.h"

 #include "BLI_bitmap.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"

 #include "BKE_DerivedMesh.h"
 #include "BKE_customdata.h"
--- a/source/blender/blenkernel/intern/editmesh_bvh.cc
+++ b/source/blender/blenkernel/intern/editmesh_bvh.cc
@ -9,7 +9,8 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_kdopbvh.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"

 #include "BKE_editmesh.h"

--- a/source/blender/blenkernel/intern/editmesh_tangent.cc
+++ b/source/blender/blenkernel/intern/editmesh_tangent.cc
@ -6,7 +6,8 @@
 * \ingroup bke
 */

-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.h"

 #include "DNA_customdata_types.h"
--- a/source/blender/blenkernel/intern/effect.cc
+++ b/source/blender/blenkernel/intern/effect.cc
@ -27,7 +27,9 @@

 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_noise.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/fcurve.cc
+++ b/source/blender/blenkernel/intern/fcurve.cc
@ -21,7 +21,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_easing.h"
 #include "BLI_ghash.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_sort_utils.h"
 #include "BLI_string_utils.h"

--- a/source/blender/blenkernel/intern/fcurve_driver.cc
+++ b/source/blender/blenkernel/intern/fcurve_driver.cc
@ -16,7 +16,9 @@
 #include "BLI_alloca.h"
 #include "BLI_expr_pylike_eval.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"
 #include "BLI_threads.h"
@ -46,6 +48,8 @@
 #  include "BPY_extern.h"
 #endif

+#include <string.h>
+
 #ifdef WITH_PYTHON
 static ThreadMutex python_driver_lock = BLI_MUTEX_INITIALIZER;
 #endif
--- a/source/blender/blenkernel/intern/fluid.cc
+++ b/source/blender/blenkernel/intern/fluid.cc
@ -12,7 +12,9 @@

 #include "BLI_fileops.h"
 #include "BLI_hash.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_task.h"
--- a/source/blender/blenkernel/intern/fmodifier.cc
+++ b/source/blender/blenkernel/intern/fmodifier.cc
@ -23,7 +23,7 @@

 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
-#include "BLI_math.h" /* windows needs for M_PI */
+#include "BLI_math_base.h"
 #include "BLI_noise.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/freestyle.cc
+++ b/source/blender/blenkernel/intern/freestyle.cc
@ -12,7 +12,7 @@
 #include "DNA_freestyle_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
 #include "BLI_string_utils.h"

 #include "BKE_freestyle.h"
--- a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
@ -17,6 +17,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_blenlib.h"
+#include "BLI_math_color.h"
 #include "BLI_math_vector.h"

 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc
@ -21,6 +21,9 @@
 #include "BLI_ghash.h"
 #include "BLI_hash.h"
 #include "BLI_heap.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_polyfill_2d.h"
--- a/source/blender/blenkernel/intern/gpencil_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_legacy.cc
@ -17,6 +17,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_blenlib.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_string_utils.h"

--- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
@ -12,6 +12,7 @@

 #include "BLI_blenlib.h"
 #include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/grease_pencil.cc
+++ b/source/blender/blenkernel/intern/grease_pencil.cc
@ -21,6 +21,8 @@

 #include "BLI_bounds.hh"
 #include "BLI_map.hh"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_memarena.h"
 #include "BLI_memory_utils.hh"
--- a/source/blender/blenkernel/intern/icons_rasterize.cc
+++ b/source/blender/blenkernel/intern/icons_rasterize.cc
@ -8,6 +8,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_bitmap_draw_2d.h"
+#include "BLI_math_color.h"
 #include "BLI_math_geom.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/idprop.cc
+++ b/source/blender/blenkernel/intern/idprop.cc
@ -11,10 +11,11 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <float.h>

 #include "BLI_endian_switch.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_base.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/kelvinlet.cc
+++ b/source/blender/blenkernel/intern/kelvinlet.cc
@ -7,6 +7,8 @@
 */

 #include "BKE_kelvinlet.h"
+#include "BLI_math_base.h"
+#include "BLI_math_vector.h"

 /* Regularized Kelvinlets: Sculpting Brushes based on Fundamental Solutions of Elasticity
 * Pixar Technical Memo #17-03 */
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@ -14,6 +14,7 @@

 #include "BLI_blenlib.h"
 #include "BLI_endian_switch.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/lattice.cc
+++ b/source/blender/blenkernel/intern/lattice.cc
@ -15,7 +15,8 @@

 #include "BLI_bitmap.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/lattice_deform.cc
+++ b/source/blender/blenkernel/intern/lattice_deform.cc
@ -15,7 +15,8 @@

 #include "MEM_guardedalloc.h"

-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_simd.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/light.cc
+++ b/source/blender/blenkernel/intern/light.cc
@ -22,7 +22,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"

-#include "BLI_math.h"
 #include "BLI_utildefines.h"

 #include "BKE_anim_data.h"
--- a/source/blender/blenkernel/intern/linestyle.cc
+++ b/source/blender/blenkernel/intern/linestyle.cc
@ -18,7 +18,7 @@
 #include "DNA_texture_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_rotation.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/mask.cc
+++ b/source/blender/blenkernel/intern/mask.cc
@ -16,7 +16,9 @@
 #include "BLI_endian_switch.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/mask_evaluate.cc
+++ b/source/blender/blenkernel/intern/mask_evaluate.cc
@ -14,7 +14,9 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "DNA_mask_types.h"
--- a/source/blender/blenkernel/intern/mask_rasterize.cc
+++ b/source/blender/blenkernel/intern/mask_rasterize.cc
@ -58,13 +58,14 @@
 #include "DNA_scene_types.h"
 #include "DNA_vec_types.h"

+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_scanfill.h"
 #include "BLI_utildefines.h"

 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
 #include "BLI_rect.h"
 #include "BLI_task.h"

--- a/source/blender/blenkernel/intern/material.cc
+++ b/source/blender/blenkernel/intern/material.cc
@ -39,7 +39,8 @@

 #include "BLI_array_utils.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/mball.cc
+++ b/source/blender/blenkernel/intern/mball.cc
@ -29,7 +29,9 @@
 #include "DNA_scene_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/mball_tessellate.cc
+++ b/source/blender/blenkernel/intern/mball_tessellate.cc
@ -22,7 +22,10 @@
 #include "DNA_scene_types.h"

 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@ -27,7 +27,7 @@
 #include "BLI_index_range.hh"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.hh"
 #include "BLI_memarena.h"
 #include "BLI_resource_scope.hh"
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@ -18,8 +18,10 @@

 #include "BLI_alloca.h"
 #include "BLI_array.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
+#include "BLI_math_vector.h"
 #include "BLI_mesh_boolean.hh"
 #include "BLI_mesh_intersect.hh"
 #include "BLI_span.hh"
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@ -23,7 +23,6 @@
 #include "BLI_edgehash.h"
 #include "BLI_index_range.hh"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
 #include "BLI_span.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/mesh_evaluate.cc
+++ b/source/blender/blenkernel/intern/mesh_evaluate.cc
@ -21,7 +21,7 @@
 #include "BLI_bitmap.h"
 #include "BLI_edgehash.h"
 #include "BLI_index_range.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"
 #include "BLI_virtual_array.hh"
--- a/source/blender/blenkernel/intern/mesh_fair.cc
+++ b/source/blender/blenkernel/intern/mesh_fair.cc
@ -9,7 +9,8 @@
 */

 #include "BLI_map.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_vector.hh"

 #include "DNA_mesh_types.h"
--- a/source/blender/blenkernel/intern/mesh_iterators.cc
+++ b/source/blender/blenkernel/intern/mesh_iterators.cc
@ -18,7 +18,7 @@
 #include "BKE_mesh_iterators.hh"

 #include "BLI_bitmap.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"

 #include "MEM_guardedalloc.h"

--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@ -17,7 +17,8 @@
 #include "DNA_object_types.h"

 #include "BLI_edgehash.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
--- a/source/blender/blenkernel/intern/mesh_mapping.cc
+++ b/source/blender/blenkernel/intern/mesh_mapping.cc
@ -18,7 +18,8 @@
 #include "BLI_bitmap.h"
 #include "BLI_buffer.h"
 #include "BLI_function_ref.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc
+++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc
@ -11,7 +11,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

-#include "BLI_math.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/mesh_mirror.cc
+++ b/source/blender/blenkernel/intern/mesh_mirror.cc
@ -7,7 +7,9 @@
 */

 #include "BLI_array.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"

 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@ -14,13 +14,15 @@

 #include "MEM_guardedalloc.h"

+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

 #include "BLI_array_utils.hh"
 #include "BLI_bit_vector.hh"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
 #include "BLI_math_vector.hh"
 #include "BLI_memarena.h"
 #include "BLI_span.hh"
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@ -20,7 +20,11 @@
 #include "BLI_array.hh"
 #include "BLI_astar.h"
 #include "BLI_bit_vector.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_solvers.h"
+#include "BLI_math_statistics.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_rand.h"
--- a/source/blender/blenkernel/intern/mesh_sample.cc
+++ b/source/blender/blenkernel/intern/mesh_sample.cc
@ -11,6 +11,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

+#include "BLI_math_geom.h"
 #include "BLI_rand.hh"
 #include "BLI_task.hh"

--- a/source/blender/blenkernel/intern/mesh_tangent.cc
+++ b/source/blender/blenkernel/intern/mesh_tangent.cc
@ -15,7 +15,8 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/mesh_tessellate.cc
+++ b/source/blender/blenkernel/intern/mesh_tessellate.cc
@ -12,7 +12,9 @@
 */

 #include "BLI_enumerable_thread_specific.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_task.h"
--- a/source/blender/blenkernel/intern/mesh_wrapper.cc
+++ b/source/blender/blenkernel/intern/mesh_wrapper.cc
@ -28,7 +28,8 @@
 #include "DNA_object_types.h"

 #include "BLI_ghash.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_math_vector.hh"
 #include "BLI_task.hh"
 #include "BLI_threads.h"
--- a/source/blender/blenkernel/intern/movieclip.cc
+++ b/source/blender/blenkernel/intern/movieclip.cc
@ -39,7 +39,7 @@

 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_threads.h"

 #include "BLT_translation.h"
--- a/source/blender/blenkernel/intern/multires.cc
+++ b/source/blender/blenkernel/intern/multires.cc
@ -18,7 +18,7 @@

 #include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc
@ -16,6 +16,7 @@
 #include "DNA_object_types.h"

 #include "BLI_listbase.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"

 #include "BKE_customdata.h"
--- a/source/blender/blenkernel/intern/multires_reshape_smooth.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_smooth.cc
@ -14,6 +14,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"

+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/multires_reshape_util.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_util.cc
@ -16,6 +16,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

+#include "BLI_math_matrix.h"
 #include "BLI_task.h"

 #include "BKE_attribute.hh"
--- a/source/blender/blenkernel/intern/node_tree_interface.cc
+++ b/source/blender/blenkernel/intern/node_tree_interface.cc
@ -8,7 +8,7 @@
 #include "BKE_node.hh"
 #include "BKE_node_tree_interface.hh"

-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_set.hh"
 #include "BLI_stack.hh"
 #include "BLI_string.h"
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@ -56,7 +56,8 @@
 #include "BLI_kdtree.h"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@ -13,11 +13,14 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_listbase.h"
+#include "BLI_math_vector.h"
 #include "BLI_string_utf8.h"

 #include "BLI_array.hh"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
+#include "BLI_math_rotation.h"
 #include "BLI_math_vector.hh"
 #include "BLI_rand.h"
 #include "BLI_span.hh"
--- a/source/blender/blenkernel/intern/object_update.cc
+++ b/source/blender/blenkernel/intern/object_update.cc
@ -17,7 +17,8 @@
 #include "DNA_scene_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_vector.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/ocean.cc
+++ b/source/blender/blenkernel/intern/ocean.cc
@ -19,7 +19,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"

-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_path_util.h"
 #include "BLI_rand.h"
 #include "BLI_task.h"
--- a/source/blender/blenkernel/intern/ocean_spectrum.cc
+++ b/source/blender/blenkernel/intern/ocean_spectrum.cc
@ -7,9 +7,10 @@
 */

 #include "BKE_ocean.h"
-#include "BLI_math.h"
 #include "ocean_intern.h"

+#include <math.h>
+
 #ifdef WITH_OCEANSIM

 /* -------------------------------------------------------------------- */
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@ -26,6 +26,7 @@
 #include "BLI_bitmap.h"
 #include "BLI_hash.h"
 #include "BLI_listbase.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/particle.cc
+++ b/source/blender/blenkernel/intern/particle.cc
@ -34,7 +34,10 @@
 #include "BLI_kdopbvh.h"
 #include "BLI_kdtree.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_rand.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
--- a/source/blender/blenkernel/intern/particle_child.cc
+++ b/source/blender/blenkernel/intern/particle_child.cc
@ -6,7 +6,9 @@
 * \ingroup bke
 */

-#include "BLI_math.h"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_noise.h"

 #include "DNA_material_types.h"
--- a/source/blender/blenkernel/intern/particle_distribute.cc
+++ b/source/blender/blenkernel/intern/particle_distribute.cc
@ -12,7 +12,6 @@

 #include "BLI_jitter_2d.h"
 #include "BLI_kdtree.h"
-#include "BLI_math.h"
 #include "BLI_math_geom.h"
 #include "BLI_rand.h"
 #include "BLI_sort.h"
--- a/Show More
+++ b/Show More