Cleanup: Remove unnecessary DNA_meshdata_types.h includes

Except for vertex groups and a few older color types, these
are generally replaced by newer generic attribute types.
Also remove some includes of DNA_mesh_types.h, since it's
included indirectly by BKE_mesh.hh currently.

source/blender/blenkernel/BKE_mesh_sample.hh

@@ -15,6 +15,7 @@
 #include "FN_field.hh"
 #include "FN_multi_function.hh"
 
+#include "BKE_attribute_math.hh"
 #include "BKE_geometry_fields.hh"
 
 struct Mesh;

source/blender/blenkernel/intern/curve_to_mesh_convert.cc

@@ -9,9 +9,6 @@
 #include "BLI_set.hh"
 #include "BLI_task.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
 #include "BKE_geometry_set.hh"

source/blender/blenkernel/intern/geometry_component_mesh.cc

@@ -5,7 +5,6 @@
 #include "BLI_listbase.h"
 #include "BLI_task.hh"
 
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 

source/blender/blenkernel/intern/image.cc

@@ -44,7 +44,6 @@
 #include "DNA_light_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"

source/blender/blenkernel/intern/material.cc

@@ -27,8 +27,6 @@
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_grease_pencil_types.h"
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"

source/blender/blenkernel/intern/mball_tessellate.cc

@@ -15,8 +15,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/blenkernel/intern/mesh_boolean_convert.cc

@@ -8,8 +8,6 @@
 
 #include <iostream>
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_attribute.hh"

source/blender/blenkernel/intern/mesh_convert.cc

@@ -13,8 +13,6 @@
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_pointcloud_types.h"

source/blender/blenkernel/intern/mesh_fair.cc

@@ -13,8 +13,6 @@
 #include "BLI_math_vector.h"
 #include "BLI_vector.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_lib_id.h"

source/blender/blenkernel/intern/mesh_iterators.cc

@@ -8,9 +8,6 @@
  * Functions for iterating mesh features.
  */
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_editmesh_cache.hh"

source/blender/blenkernel/intern/mesh_mapping.cc

@@ -13,9 +13,6 @@
 
 #include "atomic_ops.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_vec_types.h"
-
 #include "BLI_array.hh"
 #include "BLI_bitmap.h"
 #include "BLI_buffer.h"
@@ -52,7 +49,7 @@ UvVertMap *BKE_mesh_uv_vert_map_create(const blender::OffsetIndices<int> faces,
   UvMapVert *buf;
   int i, totuv, nverts;
 
-  BLI_buffer_declare_static(vec2f, tf_uv_buf, BLI_BUFFER_NOP, 32);
+  BLI_buffer_declare_static(blender::float2, tf_uv_buf, BLI_BUFFER_NOP, 32);
 
   totuv = 0;
 
@@ -88,7 +85,8 @@ UvVertMap *BKE_mesh_uv_vert_map_create(const blender::OffsetIndices<int> faces,
       float(*tf_uv)[2] = nullptr;
 
       if (use_winding) {
-        tf_uv = (float(*)[2])BLI_buffer_reinit_data(&tf_uv_buf, vec2f, size_t(face.size()));
+        tf_uv = (float(*)[2])BLI_buffer_reinit_data(
+            &tf_uv_buf, blender::float2, size_t(face.size()));
       }
 
       nverts = int(face.size());

source/blender/blenkernel/intern/mesh_merge_customdata.cc

@@ -8,9 +8,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"

source/blender/blenkernel/intern/mesh_mirror.cc

@@ -11,7 +11,6 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 

source/blender/blenkernel/intern/mesh_normals.cc

@@ -17,9 +17,6 @@
 #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"

source/blender/blenkernel/intern/mesh_remap.cc

@@ -14,9 +14,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_array.hh"
 #include "BLI_astar.h"
 #include "BLI_bit_vector.hh"

source/blender/blenkernel/intern/mesh_remesh_voxel.cc

@@ -23,7 +23,6 @@
 #include "BLI_span.hh"
 #include "BLI_task.hh"
 
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "BKE_attribute.hh"

source/blender/blenkernel/intern/mesh_runtime.cc

@@ -10,7 +10,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 

source/blender/blenkernel/intern/mesh_sample.cc

@@ -8,9 +8,6 @@
 #include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_sample.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_geom.h"
 #include "BLI_rand.hh"
 #include "BLI_task.hh"

source/blender/blenkernel/intern/mesh_tangent.cc

@@ -12,9 +12,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 #include "BLI_string.h"

source/blender/blenkernel/intern/mesh_wrapper.cc

@@ -22,8 +22,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 

source/blender/blenkernel/intern/pbvh.cc

@@ -26,9 +26,6 @@
 #include "BLI_vector.hh"
 #include "BLI_vector_set.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BKE_attribute.hh"
 #include "BKE_ccg.h"
 #include "BKE_mesh.hh"

source/blender/blenkernel/intern/pbvh_intern.hh

@@ -11,8 +11,6 @@
 #include "BLI_span.hh"
 #include "BLI_vector.hh"
 
-#include "DNA_meshdata_types.h"
-
 /** \file
  * \ingroup bke
  */

source/blender/blenkernel/intern/pbvh_pixels.cc

@@ -10,8 +10,6 @@
 #include "BKE_pbvh_pixels.hh"
 
 #include "DNA_image_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"

source/blender/blenkernel/intern/pbvh_uv_islands.hh

@@ -33,8 +33,6 @@
 #include "BLI_vector_list.hh"
 #include "BLI_virtual_array.hh"
 
-#include "DNA_meshdata_types.h"
-
 namespace blender::bke::pbvh::uv_islands {
 
 struct MeshEdge;

source/blender/blenkernel/intern/rigidbody.cc

@@ -30,7 +30,6 @@
 #include "DNA_ID.h"
 #include "DNA_collection_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_rigidbody_types.h"

source/blender/blenkernel/intern/shader_fx.cc

@@ -18,7 +18,6 @@
 #include "BLT_translation.h"
 
 #include "DNA_gpencil_legacy_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/blenkernel/intern/subdiv.cc

@@ -9,7 +9,6 @@
 #include "BKE_subdiv.hh"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
 #include "BLI_utildefines.h"

source/blender/blenkernel/intern/subdiv_ccg.cc

@@ -8,9 +8,6 @@
 
 #include "BKE_subdiv_ccg.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_enumerable_thread_specific.hh"

source/blender/blenkernel/intern/subdiv_converter_mesh.cc

@@ -10,9 +10,6 @@
 
 #include <cstring>
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_utildefines.h"
 
 #include "BKE_attribute.hh"

source/blender/blenkernel/intern/subdiv_deform.cc

@@ -11,7 +11,6 @@
 #include <cstring>
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

source/blender/blenkernel/intern/subdiv_eval.cc

@@ -8,9 +8,6 @@
 
 #include "BKE_subdiv_eval.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_timeit.hh"

source/blender/blenkernel/intern/subdiv_foreach.cc

@@ -11,8 +11,6 @@
 #include "atomic_ops.h"
 
 #include "DNA_key_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BLI_bitmap.h"
 #include "BLI_task.h"

source/blender/blenkernel/intern/subdiv_mesh.cc

@@ -12,7 +12,6 @@
 
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BLI_array.hh"
 #include "BLI_bitmap.h"

source/blender/blenkernel/intern/type_conversions.cc

@@ -4,8 +4,6 @@
 
 #include "BKE_type_conversions.hh"
 
-#include "DNA_meshdata_types.h"
-
 #include "FN_multi_function_builder.hh"
 
 #include "BLI_color.hh"

source/blender/blenkernel/intern/volume_to_mesh.cc

@@ -8,8 +8,6 @@
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_volume_types.h"
 
 #include "BKE_mesh.hh"

source/blender/blenlib/BLI_astar.h

@@ -9,6 +9,8 @@
  * \brief An implementation of the A* (AStar) algorithm to solve shortest path problem.
  */
 
+#include "DNA_listBase.h"
+
 #include "BLI_utildefines.h"
 
 #include "BLI_bitmap.h"

source/blender/bmesh/intern/bmesh_construct.cc

@@ -18,7 +18,6 @@
 #include "BKE_customdata.hh"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "bmesh.hh"
 #include "intern/bmesh_private.hh"

source/blender/bmesh/intern/bmesh_core.cc

@@ -18,8 +18,6 @@
 
 #include "BLT_translation.h"
 
-#include "DNA_meshdata_types.h"
-
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
 

source/blender/bmesh/intern/bmesh_mesh_tessellate.cc

@@ -11,8 +11,6 @@
  * \see mesh_tessellate.cc for the #Mesh equivalent of this file.
  */
 
-#include "DNA_meshdata_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_alloca.h"

source/blender/bmesh/intern/bmesh_polygon.cc

@@ -10,7 +10,6 @@
  */
 
 #include "DNA_listBase.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
 #include "MEM_guardedalloc.h"

source/blender/bmesh/intern/bmesh_query_uv.cc

@@ -18,8 +18,6 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 
-#include "DNA_meshdata_types.h"
-
 #include "bmesh.hh"
 #include "intern/bmesh_private.hh"
 

source/blender/bmesh/operators/bmo_join_triangles.cc

@@ -13,8 +13,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_geom.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"

source/blender/bmesh/operators/bmo_mirror.cc

@@ -10,8 +10,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
-
 #include "BKE_customdata.hh"
 
 #include "bmesh.hh"

source/blender/bmesh/operators/bmo_primitive.cc

@@ -17,8 +17,6 @@
 
 #include "BKE_customdata.hh"
 
-#include "DNA_meshdata_types.h"
-
 #include "bmesh.hh"
 #include "intern/bmesh_operators_private.hh"
 

source/blender/draw/intern/draw_cache_impl_mesh.cc

@@ -26,7 +26,6 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/draw/intern/draw_manager_c.cc

@@ -47,7 +47,6 @@
 
 #include "DNA_camera_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"

source/blender/draw/intern/draw_pbvh.cc

@@ -33,7 +33,6 @@
 #include "BLI_vector.hh"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BKE_DerivedMesh.hh"
 #include "BKE_attribute.hh"

source/blender/editors/mesh/editmesh_utils.cc

@@ -10,7 +10,6 @@
 
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_array.hh"

source/blender/editors/mesh/mesh_data.cc

@@ -8,8 +8,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"

source/blender/editors/mesh/mesh_mirror.cc

@@ -10,8 +10,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_editmesh.hh"

source/blender/editors/object/object_bake.cc

@@ -12,7 +12,6 @@
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/editors/object/object_bake_simulation.cc

@@ -25,7 +25,6 @@
 #include "DNA_curves_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_pointcloud_types.h"
 #include "DNA_windowmanager_types.h"

source/blender/editors/object/object_edit.cc

@@ -30,7 +30,6 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"

source/blender/editors/object/object_remesh.cc

@@ -19,8 +19,6 @@
 #include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_userdef_types.h"
 

source/blender/editors/object/object_shapekey.cc

@@ -26,7 +26,6 @@
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_context.hh"

source/blender/editors/sculpt_paint/curves_sculpt_add.cc

@@ -34,8 +34,6 @@
 #include "DNA_brush_enums.h"
 #include "DNA_brush_types.h"
 #include "DNA_curves_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/editors/sculpt_paint/curves_sculpt_comb.cc

@@ -32,8 +32,6 @@
 #include "DNA_brush_enums.h"
 #include "DNA_brush_types.h"
 #include "DNA_curves_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/editors/sculpt_paint/curves_sculpt_delete.cc

@@ -28,8 +28,6 @@
 #include "DNA_brush_enums.h"
 #include "DNA_brush_types.h"
 #include "DNA_curves_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/editors/sculpt_paint/curves_sculpt_puff.cc

@@ -16,8 +16,6 @@
 #include "DEG_depsgraph.hh"
 
 #include "DNA_brush_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "WM_api.hh"
 

source/blender/editors/sculpt_paint/curves_sculpt_slide.cc

@@ -25,8 +25,6 @@
 
 #include "DNA_brush_enums.h"
 #include "DNA_curves_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 

source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc

@@ -30,8 +30,6 @@
 #include "DNA_brush_enums.h"
 #include "DNA_brush_types.h"
 #include "DNA_curves_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/editors/sculpt_paint/paint_hide.cc

@@ -18,8 +18,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/editors/sculpt_paint/paint_image_proj.cc

@@ -43,7 +43,6 @@
 #include "DNA_defs.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_enums.h"
 #include "DNA_object_types.h"

source/blender/editors/sculpt_paint/paint_mask.cc

@@ -10,8 +10,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_vec_types.h"

source/blender/editors/sculpt_paint/paint_utils.cc

@@ -11,7 +11,6 @@
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "DNA_brush_types.h"

source/blender/editors/sculpt_paint/paint_vertex.cc

@@ -28,6 +28,7 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc

@@ -9,7 +9,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/editors/sculpt_paint/paint_weight.cc

@@ -25,6 +25,7 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/sculpt_paint/sculpt.cc

@@ -31,8 +31,6 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_customdata_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/sculpt_paint/sculpt_automasking.cc

@@ -19,8 +19,6 @@
 #include "BLI_vector.hh"
 
 #include "DNA_brush_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BKE_brush.hh"
 #include "BKE_colortools.h"

source/blender/editors/sculpt_paint/sculpt_boundary.cc

@@ -11,7 +11,6 @@
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_brush.hh"

source/blender/editors/sculpt_paint/sculpt_dyntopo.cc

@@ -13,8 +13,6 @@
 
 #include "BLT_translation.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
 #include "BKE_context.hh"

source/blender/editors/sculpt_paint/sculpt_expand.cc

@@ -16,8 +16,6 @@
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 

source/blender/editors/sculpt_paint/sculpt_face_set.cc

@@ -29,8 +29,6 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_customdata_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/editors/sculpt_paint/sculpt_filter_color.cc

@@ -14,7 +14,6 @@
 
 #include "BLT_translation.h"
 
-#include "DNA_meshdata_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.hh"

source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc

@@ -8,6 +8,7 @@
 
 #include "DNA_modifier_types.h"
 #include "DNA_windowmanager_types.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_hash.h"
@@ -20,8 +21,6 @@
 
 #include "BLT_translation.h"
 
-#include "DNA_meshdata_types.h"
-
 #include "BKE_brush.hh"
 #include "BKE_context.hh"
 #include "BKE_modifier.hh"

source/blender/editors/sculpt_paint/sculpt_geodesic.cc

@@ -18,7 +18,6 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_ccg.h"

source/blender/editors/sculpt_paint/sculpt_intern.hh

@@ -13,7 +13,6 @@
 #include "DNA_brush_types.h"
 #include "DNA_key_types.h"
 #include "DNA_listBase.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vec_types.h"
 

source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc

@@ -13,7 +13,6 @@
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_ccg.h"

source/blender/editors/sculpt_paint/sculpt_ops.cc

@@ -21,8 +21,6 @@
 #include "DNA_brush_types.h"
 #include "DNA_customdata_types.h"
 #include "DNA_listBase.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"

source/blender/editors/sculpt_paint/sculpt_paint_color.cc

@@ -13,8 +13,6 @@
 #include "BLI_task.h"
 #include "BLI_vector.hh"
 
-#include "DNA_meshdata_types.h"
-
 #include "BKE_brush.hh"
 #include "BKE_colorband.h"
 #include "BKE_colortools.h"

source/blender/editors/sculpt_paint/sculpt_pose.cc

@@ -14,7 +14,6 @@
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_brush.hh"

source/blender/editors/sculpt_paint/sculpt_smooth.cc

@@ -12,7 +12,6 @@
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "BKE_context.hh"
 #include "BKE_paint.hh"

source/blender/editors/sculpt_paint/sculpt_transform.cc

@@ -14,8 +14,6 @@
 #include "BLI_span.hh"
 #include "BLI_task.h"
 
-#include "DNA_meshdata_types.h"
-
 #include "BKE_brush.hh"
 #include "BKE_context.hh"
 #include "BKE_kelvinlet.h"

source/blender/editors/sculpt_paint/sculpt_undo.cc

@@ -41,7 +41,6 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/editors/sculpt_paint/sculpt_uv.cc

@@ -16,7 +16,6 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc

@@ -25,8 +25,6 @@
 #include "BKE_volume_grid.hh"
 
 #include "DNA_ID.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_pointcloud_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"

source/blender/editors/space_view3d/drawobject.cc

@@ -6,8 +6,6 @@
  * \ingroup spview3d
  */
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 

source/blender/editors/space_view3d/view3d_gizmo_ruler.cc

@@ -29,7 +29,6 @@
 #include "BKE_unit.hh"
 
 #include "DNA_gpencil_legacy_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_view3d_types.h"
 

source/blender/editors/space_view3d/view3d_iterators.cc

@@ -9,8 +9,6 @@
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/transform/transform_convert_mesh.cc

@@ -7,7 +7,6 @@
  */
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
 #include "MEM_guardedalloc.h"
 

source/blender/editors/transform/transform_convert_mesh_uv.cc

@@ -6,8 +6,6 @@
  * \ingroup edtransform
  */
 
-#include "DNA_meshdata_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_bitmap.h"

source/blender/editors/uvedit/uvedit_buttons.cc

@@ -11,7 +11,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"

source/blender/editors/uvedit/uvedit_ops.cc

@@ -15,7 +15,6 @@
 #include "DNA_image_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/uvedit/uvedit_path.cc

@@ -23,7 +23,6 @@
 
 #include "DNA_image_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/uvedit/uvedit_rip.cc

@@ -19,7 +19,6 @@
 
 #include "DNA_image_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/uvedit/uvedit_select.cc

@@ -14,7 +14,6 @@
 
 #include "DNA_image_types.h"
 #include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/editors/uvedit/uvedit_smart_stitch.cc

@@ -12,7 +12,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"

source/blender/editors/uvedit/uvedit_unwrap_ops.cc

@@ -13,8 +13,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_camera_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

@@ -8,6 +8,8 @@
 
 #include "BlenderFileLoader.h"
 
+#include "DNA_meshdata_types.h"
+
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"