Cleanup: header grouping

Group includes, this is mostly being done already but had become mixed
up in some areas.

source/blender/blenkernel/intern/gpencil_modifier_legacy.cc

@@ -8,6 +8,7 @@
 
 #include "BLI_assert.h"
 #include "BLI_listbase.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_colorband_types.h"

source/blender/blenkernel/intern/object_dupli.cc

@@ -20,6 +20,7 @@
 #include "BLI_string_utf8.h"
 
 #include "BLI_array.hh"
+#include "BLI_hash.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@@ -38,6 +39,7 @@
 #include "DNA_pointcloud_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_volume_types.h"
+#include "DNA_world_types.h"
 
 #include "BKE_collection.hh"
 #include "BKE_duplilist.hh"
@@ -58,10 +60,8 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "BLI_hash.h"
-#include "DNA_world_types.h"
-
 #include "NOD_geometry_nodes_log.hh"
+
 #include "RNA_access.hh"
 #include "RNA_path.hh"
 #include "RNA_prototypes.hh"

source/blender/blenlib/BLI_math_rotation.h

@@ -11,6 +11,7 @@
 #include "BLI_math_base.h"       // IWYU pragma: keep
 #include "BLI_math_constants.h"  // IWYU pragma: keep
 #include "BLI_utildefines.h"
+
 #include "DNA_vec_types.h"
 
 /* -------------------------------------------------------------------- */

source/blender/blenlib/BLI_memory_utils.hh

@@ -13,6 +13,7 @@
 #include <type_traits>
 
 #include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 namespace blender {

source/blender/blenlib/intern/BLI_dynstr.cc

@@ -15,6 +15,7 @@
 #include "BLI_memarena.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 /***/

source/blender/blenlib/intern/scanfill_utils.cc

@@ -9,6 +9,7 @@
 #include <cstdlib>
 
 #include "DNA_listBase.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_ghash.h"

source/blender/bmesh/tools/bmesh_region_match.cc

@@ -27,6 +27,7 @@
 #include "BLI_linklist_stack.h"
 #include "BLI_listbase.h"
 #include "BLI_mempool.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "bmesh.hh"

source/blender/draw/DRW_select_buffer.hh

@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "BLI_map.hh"
-#include "BLI_set.hh"
 #include "DNA_ID.h"
 
 #include "BLI_array.hh"
+#include "BLI_map.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
+#include "BLI_set.hh"
 #include "BLI_sys_types.h" /* for bool and uint */
 
 struct ARegion;

source/blender/draw/engines/external/external_engine.cc

@@ -10,7 +10,6 @@
  */
 
 #include "BKE_paint.hh"
-#include "DNA_particle_types.h"
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
@@ -18,6 +17,7 @@
 
 #include "BLT_translation.hh"
 
+#include "DNA_particle_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 

source/blender/draw/engines/gpencil/gpencil_antialiasing.cc

@@ -7,13 +7,13 @@
  */
 
 #include "BLI_rand.h"
+#include "BLI_smaa_textures.h"
+
 #include "DNA_scene_types.h"
 #include "DRW_render.hh"
 
 #include "gpencil_engine_private.hh"
 
-#include "BLI_smaa_textures.h"
-
 namespace blender::draw::gpencil {
 
 void Instance::antialiasing_init()

source/blender/draw/engines/gpencil/gpencil_engine_private.hh

@@ -8,12 +8,12 @@
 
 #pragma once
 
+#include "BLI_bitmap.h"
 #include "BLI_memblock.h"
+
 #include "DNA_shader_fx_types.h"
 #include "DRW_render.hh"
 
-#include "BLI_bitmap.h"
-
 #include "BKE_grease_pencil.hh"
 
 #include "GPU_batch.hh"

source/blender/draw/engines/overlay/overlay_cursor.hh

@@ -9,10 +9,11 @@
 #pragma once
 
 #include "BKE_paint.hh"
-#include "DNA_brush_types.h"
 
+#include "DNA_brush_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+
 #include "ED_view3d.hh"
 #include "UI_view2d.hh"
 

source/blender/editors/animation/keyframing.cc

@@ -10,8 +10,6 @@
 
 #include <fmt/format.h>
 
-#include "DNA_sequence_types.h"
-#include "ED_sequencer.hh"
 #include "MEM_guardedalloc.h"
 
 #include "BLI_string.h"
@@ -22,6 +20,7 @@
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_sequence_types.h"
 
 #include "BKE_action.hh"
 #include "BKE_anim_data.hh"
@@ -43,6 +42,7 @@
 #include "ED_keyframing.hh"
 #include "ED_object.hh"
 #include "ED_screen.hh"
+#include "ED_sequencer.hh"
 
 #include "ANIM_action.hh"
 #include "ANIM_action_iterators.hh"

source/blender/editors/asset/intern/asset_list.cc

@@ -39,6 +39,7 @@
 #include "ED_asset_list.hh"
 #include "ED_fileselect.hh"
 #include "ED_screen.hh"
+
 #include "asset_library_reference.hh"
 
 namespace blender::ed::asset::list {

source/blender/editors/asset/intern/asset_ui_utils.cc

@@ -21,9 +21,11 @@
 #include "UI_resources.hh"
 
 #include "DNA_userdef_types.h"
-#include "ED_asset.hh"
+
 #include "RNA_access.hh"
 
+#include "ED_asset.hh"
+
 namespace blender::ed::asset {
 
 void asset_tooltip(const asset_system::AssetRepresentation &asset,

source/blender/editors/interface/interface_intern.hh

@@ -18,7 +18,9 @@
 #include "BKE_fcurve.hh"
 
 #include "DNA_listBase.h"
+
 #include "RNA_types.hh"
+
 #include "UI_interface.hh"
 #include "UI_interface_layout.hh"
 #include "UI_resources.hh"

source/blender/editors/mesh/meshtools.cc

@@ -61,6 +61,7 @@
 
 #include "WM_api.hh"
 #include "WM_types.hh"
+
 #include "mesh_intern.hh"
 
 using blender::float3;

source/blender/editors/object/interface_template_shape_key_tree.cc

@@ -6,6 +6,8 @@
  * \ingroup edinterface
  */
 
+#include <fmt/format.h>
+
 #include "BKE_context.hh"
 #include "BKE_key.hh"
 
@@ -19,12 +21,13 @@
 #include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
+
 #include "DNA_key_types.h"
+
 #include "WM_api.hh"
+#include "WM_types.hh"
 
 #include "ED_undo.hh"
-#include "WM_types.hh"
-#include <fmt/format.h>
 
 namespace blender::ed::object::shapekey {
 

source/blender/editors/sculpt_paint/paint_image_proj.cc

@@ -50,6 +50,8 @@
 #include "DNA_object_enums.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "BKE_attribute.hh"
 #include "BKE_brush.hh"
@@ -77,8 +79,6 @@
 #include "BKE_report.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/editors/space_buttons/buttons_intern.hh

@@ -9,7 +9,9 @@
 #pragma once
 
 #include "BLI_bitmap.h"
+
 #include "DNA_listBase.h"
+
 #include "RNA_types.hh"
 
 struct ARegionType;

source/blender/editors/space_console/console_ops.cc

@@ -31,6 +31,7 @@
 #include "WM_types.hh"
 
 #include "ED_screen.hh"
+
 #include "UI_view2d.hh"
 
 #include "RNA_access.hh"

source/blender/editors/space_node/node_shader_preview.cc

@@ -55,6 +55,7 @@
 #include "ED_node_preview.hh"
 #include "ED_render.hh"
 #include "ED_screen.hh"
+
 #include "node_intern.hh"
 
 namespace blender::ed::space_node {

source/blender/editors/space_sequencer/sequencer_edit.cc

@@ -6,25 +6,25 @@
  * \ingroup spseq
  */
 
-#include "BLI_string_ref.hh"
-#include "BLI_string_utils.hh"
-#include "BLI_vector.hh"
-#include "DNA_sequence_types.h"
-#include "MEM_guardedalloc.h"
-
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_math_vector.h"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
+#include "BLI_string_ref.hh"
 #include "BLI_string_utf8.h"
+#include "BLI_string_utils.hh"
 #include "BLI_timecode.h"
 #include "BLI_utildefines.h"
+#include "BLI_vector.hh"
+
+#include "MEM_guardedalloc.h"
 
 #include "BLT_translation.hh"
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_sequence_types.h"
 #include "DNA_sound_types.h"
 
 #include "BKE_context.hh"

source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc

@@ -20,7 +20,6 @@
 #include "BKE_lib_id.hh"
 #include "BKE_volume.hh"
 
-#include "ED_spreadsheet.hh"
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
 
@@ -33,6 +32,7 @@
 #include "BLT_translation.hh"
 
 #include "ED_outliner.hh"
+#include "ED_spreadsheet.hh"
 
 #include "spreadsheet_data_source_geometry.hh"
 #include "spreadsheet_dataset_draw.hh"

source/blender/editors/transform/transform_gizmo_3d_cage.cc

@@ -20,6 +20,7 @@
 #include "ED_gizmo_library.hh"
 #include "ED_gizmo_utils.hh"
 #include "ED_screen.hh"
+
 #include "WM_api.hh"
 
 #include "RNA_access.hh"

source/blender/editors/transform/transform_gizmo_3d_shear.cc

@@ -20,6 +20,7 @@
 #include "ED_gizmo_library.hh"
 #include "ED_gizmo_utils.hh"
 #include "ED_screen.hh"
+
 #include "WM_api.hh"
 
 #include "UI_resources.hh"

source/blender/editors/undo/undo_system_types.cc

@@ -21,6 +21,7 @@
 #include "ED_sculpt.hh"
 #include "ED_text.hh"
 #include "ED_undo.hh"
+
 #include "undo_intern.hh"
 
 /* Keep last */

source/blender/editors/util/ed_util.cc

@@ -51,6 +51,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
+
 #include "WM_api.hh"
 #include "WM_types.hh"
 

source/blender/editors/uvedit/uvedit_path.cc

@@ -12,15 +12,15 @@
 #include <cstring>
 
 #include "BLI_linklist.h"
-#include "DNA_windowmanager_types.h"
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "BKE_context.hh"
 #include "BKE_customdata.hh"

source/blender/imbuf/intern/oiio/openimageio_support.cc

@@ -14,6 +14,7 @@
 #include "BKE_idprop.hh"
 
 #include "DNA_ID.h"
+
 #include "IMB_allocimbuf.hh"
 #include "IMB_colormanagement.hh"
 #include "IMB_filetype.hh"

source/blender/imbuf/intern/scaling.cc

@@ -10,6 +10,7 @@
 #include "BLI_math_vector.hh"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "IMB_filter.hh"

source/blender/imbuf/intern/util_gpu.cc

@@ -7,6 +7,7 @@
  */
 
 #include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "GPU_capabilities.hh"

source/blender/io/grease_pencil/intern/grease_pencil_io_import_svg.cc

@@ -14,12 +14,12 @@
 #include "BLI_math_vector.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_path_utils.hh"
+#include "BLI_string.h"
 
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_report.hh"
 
-#include "BLI_string.h"
 #include "DNA_grease_pencil_types.h"
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"

source/blender/io/ply/IO_ply.cc

@@ -9,8 +9,11 @@
 #include <fmt/core.h>
 
 #include "BLI_timeit.hh"
+
 #include "DNA_windowmanager_types.h"
+
 #include "IO_ply.hh"
+
 #include "ply_export.hh"
 #include "ply_import.hh"
 

source/blender/makesrna/RNA_define.hh

@@ -15,6 +15,7 @@
 #include <limits.h>
 
 #include "DNA_listBase.h"
+
 #include "RNA_types.hh"
 
 #ifdef UNIT_TEST

source/blender/makesrna/intern/rna_define.cc

@@ -15,7 +15,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
 #include "DNA_defaults.h"
@@ -27,6 +26,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math_bits.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_blender_version.h" /* For #BLENDER_VERSION deprecation warnings. */
 

source/blender/makesrna/intern/rna_lattice.cc

@@ -20,6 +20,8 @@
 #  include <algorithm>
 #  include <fmt/format.h>
 
+#  include "BLI_string.h"
+
 #  include "DNA_curve_types.h"
 #  include "DNA_meshdata_types.h"
 #  include "DNA_scene_types.h"
@@ -27,14 +29,14 @@
 #  include "BKE_deform.hh"
 #  include "BKE_lattice.hh"
 #  include "BKE_main.hh"
-#  include "BLI_string.h"
 
 #  include "DEG_depsgraph.hh"
 
-#  include "ED_lattice.hh"
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
+#  include "ED_lattice.hh"
+
 static void rna_LatticePoint_co_get(PointerRNA *ptr, float *values)
 {
   Lattice *lt = (Lattice *)ptr->owner_id;

source/blender/makesrna/intern/rna_light.cc

@@ -34,10 +34,11 @@
 
 #  include "DEG_depsgraph.hh"
 
-#  include "ED_node.hh"
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
+#  include "ED_node.hh"
+
 static StructRNA *rna_Light_refine(PointerRNA *ptr)
 {
   Light *la = (Light *)ptr->data;

source/blender/makesrna/intern/rna_node_tree_interface.cc

@@ -100,9 +100,11 @@ static const EnumPropertyItem node_default_input_items[] = {
 #  include "NOD_socket.hh"
 
 #  include "DNA_material_types.h"
-#  include "ED_node.hh"
+
 #  include "WM_api.hh"
 
+#  include "ED_node.hh"
+
 /* Internal RNA function declarations, used to invoke registered callbacks. */
 extern FunctionRNA rna_NodeTreeInterfaceSocket_draw_func;
 extern FunctionRNA rna_NodeTreeInterfaceSocket_init_socket_func;

source/blender/makesrna/intern/rna_rna.cc

@@ -265,6 +265,7 @@ const EnumPropertyItem rna_enum_property_string_search_flag_items[] = {
 #ifdef RNA_RUNTIME
 #  include "BLI_ghash.h"
 #  include "BLI_string.h"
+
 #  include "MEM_guardedalloc.h"
 
 #  include "BKE_idprop.hh"

source/blender/makesrna/intern/rna_sequencer.cc

@@ -20,11 +20,11 @@
 
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-
 #include "RNA_types.hh"
-#include "UI_resources.hh"
 #include "rna_internal.hh"
 
+#include "UI_resources.hh"
+
 #include "SEQ_effects.hh"
 #include "SEQ_sequencer.hh"
 #include "SEQ_sound.hh"

source/blender/modifiers/intern/MOD_particleinstance.cc

@@ -6,16 +6,15 @@
  * \ingroup modifiers
  */
 
-#include "BLI_color.hh"
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-
+#include "BLI_color.hh"
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 

source/blender/nodes/composite/nodes/node_composite_boxmask.cc

@@ -8,11 +8,12 @@
 
 #include <cmath>
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 
+#include "BKE_node.hh"
+
 #include "UI_interface_layout.hh"
 #include "UI_resources.hh"
 

source/blender/nodes/composite/nodes/node_composite_channel_matte.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_color.h"
 #include "BLI_math_vector_types.hh"
@@ -15,6 +14,8 @@
 
 #include "NOD_multi_function.hh"
 
+#include "BKE_node.hh"
+
 #include "RNA_access.hh"
 
 #include "UI_interface_layout.hh"

source/blender/nodes/composite/nodes/node_composite_color_matte.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_color.h"
 #include "BLI_math_vector_types.hh"
@@ -15,6 +14,8 @@
 
 #include "NOD_multi_function.hh"
 
+#include "BKE_node.hh"
+
 #include "UI_resources.hh"
 
 #include "GPU_material.hh"

source/blender/nodes/composite/nodes/node_composite_colorbalance.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_color.h"
 #include "BLI_math_matrix_types.hh"
@@ -15,6 +14,7 @@
 
 #include "FN_multi_function_builder.hh"
 
+#include "BKE_node.hh"
 #include "BKE_node_runtime.hh"
 
 #include "NOD_multi_function.hh"

source/blender/nodes/composite/nodes/node_composite_cornerpin.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
@@ -14,6 +13,7 @@
 #include "GPU_shader.hh"
 #include "GPU_texture.hh"
 
+#include "BKE_node.hh"
 #include "BKE_tracking.h"
 
 #include "UI_interface_layout.hh"

source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc

@@ -11,7 +11,6 @@
 
 #include <fmt/format.h>
 
-#include "BKE_node.hh"
 #include "node_composite_util.hh"
 
 #include "BLI_assert.h"
@@ -38,6 +37,7 @@
 #include "BKE_lib_id.hh"
 #include "BKE_library.hh"
 #include "BKE_main.hh"
+#include "BKE_node.hh"
 
 #include "MEM_guardedalloc.h"
 

source/blender/nodes/composite/nodes/node_composite_curves.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"
@@ -18,6 +17,7 @@
 #include "DNA_color_types.h"
 
 #include "BKE_colortools.hh"
+#include "BKE_node.hh"
 
 #include "GPU_material.hh"
 

source/blender/nodes/composite/nodes/node_composite_huecorrect.cc

@@ -6,7 +6,6 @@
  * \ingroup cmpnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.hh"
@@ -17,6 +16,7 @@
 #include "NOD_multi_function.hh"
 
 #include "BKE_colortools.hh"
+#include "BKE_node.hh"
 
 #include "GPU_material.hh"
 

source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "BKE_curves.hh"
-#include "NOD_rna_define.hh"
 
 #include "UI_interface_layout.hh"
 #include "UI_resources.hh"
 
+#include "NOD_rna_define.hh"
 #include "NOD_socket_search_link.hh"
 
 #include "node_geometry_util.hh"

source/blender/nodes/geometry/nodes/node_geo_points.cc

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "BKE_pointcloud.hh"
+
 #include "DNA_pointcloud_types.h"
 
 #include "node_geometry_util.hh"

source/blender/nodes/texture/nodes/node_texture_image.cc

@@ -6,10 +6,13 @@
  * \ingroup texnodes
  */
 
-#include "BKE_image.hh"
 #include "BLI_math_vector.h"
 #include "BLI_threads.h"
+
 #include "IMB_imbuf.hh"
+
+#include "BKE_image.hh"
+
 #include "node_texture_util.hh"
 #include "node_util.hh"
 

source/blender/nodes/texture/nodes/node_texture_scale.cc

@@ -6,8 +6,10 @@
  * \ingroup texnodes
  */
 
-#include "BKE_node.hh"
 #include "BLI_math_vector.h"
+
+#include "BKE_node.hh"
+
 #include "node_texture_util.hh"
 
 static blender::bke::bNodeSocketTemplate inputs[] = {

source/blender/python/mathutils/mathutils_geometry.cc

@@ -13,12 +13,14 @@
 
 /* Used for PolyFill */
 #ifndef MATH_STANDALONE /* define when building outside blender */
-#  include "BKE_curve.hh"
-#  include "BKE_displist.h"
 #  include "BLI_boxpack_2d.h"
 #  include "BLI_convexhull_2d.hh"
 #  include "BLI_delaunay_2d.hh"
 #  include "BLI_listbase.h"
+
+#  include "BKE_curve.hh"
+#  include "BKE_displist.h"
+
 #  include "MEM_guardedalloc.h"
 #endif /* !MATH_STANDALONE */
 

source/blender/sequencer/intern/effects/effects.hh

@@ -12,6 +12,7 @@
 #include "BLI_math_color.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"
+
 #include "IMB_imbuf_types.hh"
 #include "SEQ_effects.hh"
 

source/blender/sequencer/intern/sequencer.cc

@@ -10,23 +10,22 @@
 
 #define DNA_DEPRECATED_ALLOW
 
-#include "BKE_duplilist.hh"
-#include "BLI_assert.h"
-#include "BLI_map.hh"
-#include "DNA_listBase.h"
-#include "SEQ_transform.hh"
 #include <cstddef>
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_listBase.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 #include "DNA_sound_types.h"
 
+#include "BLI_assert.h"
 #include "BLI_listbase.h"
+#include "BLI_map.hh"
 #include "BLI_path_utils.hh"
 #include "BLI_string_utf8.h"
 
+#include "BKE_duplilist.hh"
 #include "BKE_fcurve.hh"
 #include "BKE_idprop.hh"
 #include "BKE_lib_id.hh"
@@ -52,6 +51,7 @@
 #include "SEQ_sound.hh"
 #include "SEQ_thumbnail_cache.hh"
 #include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 #include "SEQ_utils.hh"
 
 #include "BLO_read_write.hh"

source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "DNA_listBase.h"
+
 #include "WM_gizmo_types.hh"
 
 #include "BLI_vector.hh"