From fe213f80a4b33bf208c403e13bb88078ca2286fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= <foucault.clem@gmail.com>
Date: Thu, 25 Sep 2025 10:57:02 +0200
Subject: [PATCH] GPU: Shader: Make info files generated

This is the first step of moving the create infos
back inside shader sources.

All info files are now treated as source files.
However, they are not considered in the include tree
yet. This will come in another following PR.

Each shader source file now generate a `.info` file
containing only the create info declarations.

This renames all info files so that they do not
conflict with their previous versions that were
copied (non-generated).

Pull Request: https://projects.blender.org/blender/blender/pulls/146676
---
 build_files/cmake/macros.cmake                |   6 +-
 intern/opensubdiv/CMakeLists.txt              |   5 +
 source/blender/compositor/CMakeLists.txt      |  67 +++++++
 .../compositor_parallel_reduction.glsl        |   2 +-
 ...info.hh => compositor_alpha_crop_infos.hh} |   0
 ....hh => compositor_bilateral_blur_infos.hh} |   0
 ...info.hh => compositor_bokeh_blur_infos.hh} |   0
 ...positor_bokeh_blur_variable_size_infos.hh} |   0
 ...nfo.hh => compositor_bokeh_image_infos.hh} |   0
 ...k_info.hh => compositor_box_mask_infos.hh} |   0
 ...hh => compositor_compute_preview_infos.hh} |   0
 ...rt_info.hh => compositor_convert_infos.hh} |   0
 ...nfo.hh => compositor_cryptomatte_infos.hh} |   0
 ...us_info.hh => compositor_defocus_infos.hh} |   0
 ...compositor_deriche_gaussian_blur_infos.hh} |   0
 ..._info.hh => compositor_despeckle_infos.hh} |   0
 ...h => compositor_directional_blur_infos.hh} |   0
 ...e_info.hh => compositor_displace_infos.hh} |   0
 ...h => compositor_double_edge_mask_infos.hh} |   0
 ...nfo.hh => compositor_edge_filter_infos.hh} |   0
 ...fo.hh => compositor_ellipse_mask_infos.hh} |   0
 ...ter_info.hh => compositor_filter_infos.hh} |   0
 ..._flip_info.hh => compositor_flip_infos.hh} |   0
 ...o.hh => compositor_gamma_correct_infos.hh} |   0
 ...lare_info.hh => compositor_glare_infos.hh} |   0
 ...sk_info.hh => compositor_id_mask_infos.hh} |   0
 ... => compositor_image_coordinates_infos.hh} |   0
 ...info.hh => compositor_image_crop_infos.hh} |   0
 ...nt_info.hh => compositor_inpaint_infos.hh} |   0
 ...o.hh => compositor_jump_flooding_infos.hh} |   0
 ...ing_info.hh => compositor_keying_infos.hh} |   0
 ...o.hh => compositor_keying_screen_infos.hh} |   0
 ...a_info.hh => compositor_kuwahara_infos.hh} |   0
 ...hh => compositor_lens_distortion_infos.hh} |   0
 ..._uv_info.hh => compositor_map_uv_infos.hh} |   0
 ...=> compositor_morphological_blur_infos.hh} |   0
 ...r_morphological_distance_feather_infos.hh} |   0
 ...ompositor_morphological_distance_infos.hh} |   0
 ...morphological_distance_threshold_infos.hh} |   0
 ...=> compositor_morphological_step_infos.hh} |   0
 ...nfo.hh => compositor_motion_blur_infos.hh} |   0
 ...h => compositor_movie_distortion_infos.hh} |   0
 ..._info.hh => compositor_normalize_infos.hh} |   0
 ...or_pad_info.hh => compositor_pad_infos.hh} |   0
 ...=> compositor_parallel_reduction_infos.hh} |   0
 ...e_info.hh => compositor_pixelate_infos.hh} |   0
 ...fo.hh => compositor_plane_deform_infos.hh} |   0
 ... => compositor_premultiply_alpha_infos.hh} |   0
 ...info.hh => compositor_read_input_infos.hh} |   0
 ... => compositor_realize_on_domain_infos.hh} |   0
 ...fo.hh => compositor_sample_pixel_infos.hh} |   0
 ....hh => compositor_scale_variable_infos.hh} |   0
 ..._smaa_info.hh => compositor_smaa_infos.hh} |   0
 ...plit_info.hh => compositor_split_infos.hh} |   0
 ... => compositor_summed_area_table_infos.hh} |   0
 ....hh => compositor_symmetric_blur_infos.hh} |   0
 ...tor_symmetric_blur_variable_size_infos.hh} |   0
 ...positor_symmetric_separable_blur_infos.hh} |   0
 ...ric_separable_blur_variable_size_infos.hh} |   0
 ...ompositor_tone_map_photoreceptor_infos.hh} |   0
 ...hh => compositor_tone_map_simple_infos.hh} |   0
 ... => compositor_translate_wrapped_infos.hh} |   0
 ...mpositor_van_vliet_gaussian_blur_infos.hh} |   0
 ...fo.hh => compositor_write_output_infos.hh} |   0
 ..._info.hh => compositor_z_combine_infos.hh} |   0
 source/blender/draw/CMakeLists.txt            |  63 ++++++
 .../shaders/eevee_ambient_occlusion_lib.glsl  |   2 +-
 .../eevee_ambient_occlusion_pass_comp.glsl    |   2 +-
 .../shaders/eevee_attributes_curves_lib.glsl  |   2 +-
 .../shaders/eevee_attributes_mesh_lib.glsl    |   2 +-
 .../eevee_attributes_pointcloud_lib.glsl      |   2 +-
 .../shaders/eevee_attributes_volume_lib.glsl  |   2 +-
 .../engines/eevee/shaders/eevee_bxdf_lib.glsl |   2 +-
 .../shaders/eevee_bxdf_microfacet_lib.glsl    |   2 +-
 .../eevee/shaders/eevee_camera_lib.glsl       |   2 +-
 .../eevee/shaders/eevee_cryptomatte_lib.glsl  |   2 +-
 .../shaders/eevee_debug_gbuffer_frag.glsl     |   2 +-
 .../eevee_debug_irradiance_grid_frag.glsl     |   2 +-
 .../eevee_debug_irradiance_grid_vert.glsl     |   2 +-
 .../shaders/eevee_debug_surfels_frag.glsl     |   2 +-
 .../shaders/eevee_debug_surfels_vert.glsl     |   2 +-
 .../eevee_deferred_aov_clear_frag.glsl        |   2 +-
 .../shaders/eevee_deferred_capture_frag.glsl  |   2 +-
 .../shaders/eevee_deferred_combine_frag.glsl  |   2 +-
 .../shaders/eevee_deferred_light_frag.glsl    |   2 +-
 .../shaders/eevee_deferred_planar_frag.glsl   |   2 +-
 .../eevee_deferred_thickness_amend_frag.glsl  |   2 +-
 .../eevee_deferred_tile_classify_frag.glsl    |   2 +-
 .../eevee_depth_of_field_accumulator_lib.glsl |   2 +-
 .../eevee_depth_of_field_bokeh_lut_comp.glsl  |   2 +-
 .../eevee_depth_of_field_downsample_comp.glsl |   2 +-
 .../eevee_depth_of_field_filter_comp.glsl     |   2 +-
 .../eevee_depth_of_field_gather_comp.glsl     |   2 +-
 .../eevee_depth_of_field_hole_fill_comp.glsl  |   2 +-
 .../shaders/eevee_depth_of_field_lib.glsl     |   2 +-
 .../eevee_depth_of_field_reduce_comp.glsl     |   2 +-
 .../eevee_depth_of_field_resolve_comp.glsl    |   2 +-
 .../eevee_depth_of_field_scatter_frag.glsl    |   2 +-
 .../eevee_depth_of_field_scatter_vert.glsl    |   2 +-
 .../eevee_depth_of_field_setup_comp.glsl      |   2 +-
 .../eevee_depth_of_field_stabilize_comp.glsl  |   2 +-
 ...evee_depth_of_field_tiles_dilate_comp.glsl |   2 +-
 ...vee_depth_of_field_tiles_flatten_comp.glsl |   2 +-
 .../eevee_display_lightprobe_planar_frag.glsl |   2 +-
 .../eevee_display_lightprobe_planar_vert.glsl |   2 +-
 .../eevee_display_lightprobe_sphere_frag.glsl |   2 +-
 .../eevee_display_lightprobe_sphere_vert.glsl |   2 +-
 .../eevee_display_lightprobe_volume_frag.glsl |   2 +-
 .../eevee_display_lightprobe_volume_vert.glsl |   2 +-
 .../eevee/shaders/eevee_film_comp.glsl        |   2 +-
 .../eevee/shaders/eevee_film_copy_frag.glsl   |   2 +-
 .../eevee_film_cryptomatte_post_comp.glsl     |   2 +-
 .../eevee/shaders/eevee_film_frag.glsl        |   2 +-
 .../engines/eevee/shaders/eevee_film_lib.glsl |   2 +-
 .../shaders/eevee_film_pass_convert_comp.glsl |   2 +-
 .../eevee/shaders/eevee_gbuffer_lib.glsl      |   2 +-
 .../shaders/eevee_gbuffer_write_lib.glsl      |   2 +-
 .../eevee/shaders/eevee_geom_curves_vert.glsl |   2 +-
 .../eevee/shaders/eevee_geom_mesh_vert.glsl   |   2 +-
 .../shaders/eevee_geom_pointcloud_vert.glsl   |   2 +-
 .../eevee/shaders/eevee_geom_volume_vert.glsl |   2 +-
 .../eevee/shaders/eevee_geom_world_vert.glsl  |   2 +-
 .../eevee/shaders/eevee_hiz_debug_frag.glsl   |   2 +-
 .../eevee/shaders/eevee_hiz_update_comp.glsl  |   2 +-
 .../shaders/eevee_horizon_denoise_comp.glsl   |   2 +-
 .../shaders/eevee_horizon_resolve_comp.glsl   |   2 +-
 .../shaders/eevee_horizon_scan_comp.glsl      |   2 +-
 .../shaders/eevee_horizon_scan_eval_lib.glsl  |   2 +-
 .../shaders/eevee_horizon_setup_comp.glsl     |   2 +-
 .../eevee_light_culling_debug_frag.glsl       |   2 +-
 .../eevee_light_culling_select_comp.glsl      |   2 +-
 .../eevee_light_culling_sort_comp.glsl        |   2 +-
 .../eevee_light_culling_tile_comp.glsl        |   2 +-
 .../eevee_light_culling_zbin_comp.glsl        |   2 +-
 .../eevee/shaders/eevee_light_eval_lib.glsl   |   2 +-
 .../eevee_light_shadow_setup_comp.glsl        |   2 +-
 .../eevee/shaders/eevee_lightprobe_lib.glsl   |   2 +-
 ...eevee_lightprobe_sphere_convolve_comp.glsl |   2 +-
 ...vee_lightprobe_sphere_irradiance_comp.glsl |   2 +-
 .../shaders/eevee_lightprobe_sphere_lib.glsl  |   2 +-
 .../eevee_lightprobe_sphere_mapping_lib.glsl  |   2 +-
 .../eevee_lightprobe_sphere_remap_comp.glsl   |   2 +-
 .../eevee_lightprobe_sphere_select_comp.glsl  |   2 +-
 ...eevee_lightprobe_sphere_sunlight_comp.glsl |   2 +-
 .../eevee_lightprobe_volume_bounds_comp.glsl  |   2 +-
 .../eevee_lightprobe_volume_load_comp.glsl    |   2 +-
 .../eevee_lightprobe_volume_offset_comp.glsl  |   2 +-
 .../eevee_lightprobe_volume_ray_comp.glsl     |   2 +-
 .../eevee_lightprobe_volume_world_comp.glsl   |   2 +-
 .../shaders/eevee_lookdev_display_frag.glsl   |   2 +-
 .../shaders/eevee_lookdev_display_vert.glsl   |   2 +-
 .../engines/eevee/shaders/eevee_ltc_lib.glsl  |   2 +-
 .../engines/eevee/shaders/eevee_lut_comp.glsl |   2 +-
 .../eevee_motion_blur_dilate_comp.glsl        |   2 +-
 .../eevee_motion_blur_flatten_comp.glsl       |   2 +-
 .../eevee_motion_blur_gather_comp.glsl        |   2 +-
 .../eevee/shaders/eevee_motion_blur_lib.glsl  |   2 +-
 .../eevee/shaders/eevee_nodetree_lib.glsl     |   2 +-
 .../shaders/eevee_occupancy_convert_frag.glsl |   2 +-
 .../eevee_ray_denoise_bilateral_comp.glsl     |   2 +-
 .../eevee_ray_denoise_spatial_comp.glsl       |   2 +-
 .../eevee_ray_denoise_temporal_comp.glsl      |   2 +-
 .../shaders/eevee_ray_generate_comp.glsl      |   2 +-
 .../shaders/eevee_ray_tile_classify_comp.glsl |   2 +-
 .../shaders/eevee_ray_tile_compact_comp.glsl  |   2 +-
 .../eevee_ray_trace_fallback_comp.glsl        |   2 +-
 .../shaders/eevee_ray_trace_planar_comp.glsl  |   2 +-
 .../shaders/eevee_ray_trace_screen_comp.glsl  |   2 +-
 .../shaders/eevee_renderpass_clear_frag.glsl  |   2 +-
 .../eevee/shaders/eevee_renderpass_lib.glsl   |   2 +-
 .../eevee/shaders/eevee_sampling_lib.glsl     |   2 +-
 .../eevee_shadow_clipmap_clear_comp.glsl      |   2 +-
 .../shaders/eevee_shadow_debug_frag.glsl      |   2 +-
 .../eevee_shadow_page_allocate_comp.glsl      |   2 +-
 .../shaders/eevee_shadow_page_clear_comp.glsl |   2 +-
 .../eevee_shadow_page_defrag_comp.glsl        |   2 +-
 .../shaders/eevee_shadow_page_free_comp.glsl  |   2 +-
 .../shaders/eevee_shadow_page_mask_comp.glsl  |   2 +-
 .../shaders/eevee_shadow_page_ops_lib.glsl    |   2 +-
 .../shaders/eevee_shadow_page_tile_frag.glsl  |   2 +-
 .../shaders/eevee_shadow_page_tile_vert.glsl  |   2 +-
 .../shaders/eevee_shadow_tag_update_comp.glsl |   2 +-
 .../shaders/eevee_shadow_tag_usage_comp.glsl  |   2 +-
 .../shaders/eevee_shadow_tag_usage_frag.glsl  |   2 +-
 .../shaders/eevee_shadow_tag_usage_lib.glsl   |   2 +-
 .../eevee_shadow_tag_usage_surfels_comp.glsl  |   2 +-
 .../shaders/eevee_shadow_tag_usage_vert.glsl  |   2 +-
 .../eevee_shadow_tag_usage_volume_comp.glsl   |   2 +-
 .../eevee_shadow_tilemap_amend_comp.glsl      |   2 +-
 .../eevee_shadow_tilemap_bounds_comp.glsl     |   2 +-
 .../eevee_shadow_tilemap_finalize_comp.glsl   |   2 +-
 .../eevee_shadow_tilemap_init_comp.glsl       |   2 +-
 .../shaders/eevee_shadow_tilemap_lib.glsl     |   2 +-
 .../eevee_shadow_tilemap_rendermap_comp.glsl  |   2 +-
 .../shaders/eevee_shadow_tracing_lib.glsl     |   2 +-
 .../shaders/eevee_shadow_visibility_comp.glsl |   2 +-
 .../eevee_subsurface_convolve_comp.glsl       |   2 +-
 .../eevee/shaders/eevee_subsurface_lib.glsl   |   2 +-
 .../shaders/eevee_subsurface_setup_comp.glsl  |   2 +-
 .../shaders/eevee_surf_capture_frag.glsl      |   2 +-
 .../shaders/eevee_surf_deferred_frag.glsl     |   2 +-
 .../eevee/shaders/eevee_surf_depth_frag.glsl  |   2 +-
 .../shaders/eevee_surf_forward_frag.glsl      |   2 +-
 .../eevee/shaders/eevee_surf_hybrid_frag.glsl |   2 +-
 .../engines/eevee/shaders/eevee_surf_lib.glsl |   2 +-
 .../shaders/eevee_surf_occupancy_frag.glsl    |   2 +-
 .../eevee/shaders/eevee_surf_shadow_frag.glsl |   2 +-
 .../eevee/shaders/eevee_surf_volume_frag.glsl |   2 +-
 .../eevee/shaders/eevee_surf_world_frag.glsl  |   2 +-
 .../eevee_surfel_cluster_build_comp.glsl      |   2 +-
 .../shaders/eevee_surfel_light_comp.glsl      |   2 +-
 .../shaders/eevee_surfel_list_build_comp.glsl |   2 +-
 .../shaders/eevee_surfel_list_sort_comp.glsl  |   2 +-
 .../eevee/shaders/eevee_surfel_ray_comp.glsl  |   2 +-
 .../eevee/shaders/eevee_utility_tx_lib.glsl   |   2 +-
 .../eevee/shaders/eevee_velocity_lib.glsl     |   2 +-
 .../eevee/shaders/eevee_vertex_copy_comp.glsl |   2 +-
 .../eevee_volume_integration_comp.glsl        |   2 +-
 .../eevee/shaders/eevee_volume_lib.glsl       |   2 +-
 .../shaders/eevee_volume_resolve_frag.glsl    |   2 +-
 .../shaders/eevee_volume_scatter_comp.glsl    |   2 +-
 ...fo.hh => eevee_ambient_occlusion_infos.hh} |   4 +-
 .../eevee/shaders/infos/eevee_common_info.hh  |   4 +-
 .../eevee/shaders/infos/eevee_common_infos.hh | 173 ++++++++++++++++
 ...ferred_info.hh => eevee_deferred_infos.hh} |   6 +-
 ..._info.hh => eevee_depth_of_field_infos.hh} |   6 +-
 ...eevee_film_info.hh => eevee_film_infos.hh} |   8 +-
 .../{eevee_hiz_info.hh => eevee_hiz_infos.hh} |   6 +-
 ...g_info.hh => eevee_light_culling_infos.hh} |   8 +-
 ...fo.hh => eevee_lightprobe_sphere_infos.hh} |   8 +-
 ...fo.hh => eevee_lightprobe_volume_infos.hh} |   6 +-
 ...lookdev_info.hh => eevee_lookdev_infos.hh} |   2 +-
 .../{eevee_lut_info.hh => eevee_lut_infos.hh} |   2 +-
 ...terial_info.hh => eevee_material_infos.hh} |   8 +-
 ...lur_info.hh => eevee_motion_blur_infos.hh} |   6 +-
 ...e_shadow_info.hh => eevee_shadow_infos.hh} |   8 +-
 ...face_info.hh => eevee_subsurface_infos.hh} |   2 +-
 ...tracing_info.hh => eevee_tracing_infos.hh} |   4 +-
 ...locity_info.hh => eevee_velocity_infos.hh} |   4 +-
 ...e_volume_info.hh => eevee_volume_infos.hh} |   8 +-
 ...pencil_antialiasing_accumulation_frag.glsl |   2 +-
 .../shaders/gpencil_antialiasing_frag.glsl    |   2 +-
 .../shaders/gpencil_antialiasing_vert.glsl    |   2 +-
 .../shaders/gpencil_depth_merge_frag.glsl     |   2 +-
 .../shaders/gpencil_depth_merge_vert.glsl     |   2 +-
 .../engines/gpencil/shaders/gpencil_frag.glsl |   2 +-
 .../shaders/gpencil_layer_blend_frag.glsl     |   2 +-
 .../shaders/gpencil_mask_invert_frag.glsl     |   2 +-
 .../engines/gpencil/shaders/gpencil_vert.glsl |   2 +-
 .../gpencil/shaders/gpencil_vfx_frag.glsl     |   2 +-
 .../{gpencil_info.hh => gpencil_infos.hh}     |   6 +-
 ...encil_vfx_info.hh => gpencil_vfx_infos.hh} |   4 +-
 ...ne_image_info.hh => engine_image_infos.hh} |   0
 ..._info.hh => overlay_antialiasing_infos.hh} |   4 +-
 ...ture_info.hh => overlay_armature_infos.hh} |  10 +-
 ...nd_info.hh => overlay_background_infos.hh} |   6 +-
 ...common_info.hh => overlay_common_infos.hh} |   0
 ...ode_info.hh => overlay_edit_mode_infos.hh} |   8 +-
 ...y_extra_info.hh => overlay_extra_infos.hh} |   8 +-
 ...facing_info.hh => overlay_facing_infos.hh} |   6 +-
 ...lay_grid_info.hh => overlay_grid_infos.hh} |   4 +-
 ...tline_info.hh => overlay_outline_infos.hh} |  10 +-
 ...y_paint_info.hh => overlay_paint_infos.hh} |   6 +-
 ...info.hh => overlay_sculpt_curves_infos.hh} |   6 +-
 ...sculpt_info.hh => overlay_sculpt_infos.hh} |   6 +-
 ...o.hh => overlay_viewer_attribute_infos.hh} |   8 +-
 ...volume_info.hh => overlay_volume_infos.hh} |   6 +-
 ...ame_info.hh => overlay_wireframe_infos.hh} |   8 +-
 .../shaders/overlay_antialiasing_frag.glsl    |   2 +-
 .../overlay_armature_dof_solid_frag.glsl      |   2 +-
 .../shaders/overlay_armature_dof_vert.glsl    |   2 +-
 ...verlay_armature_envelope_outline_vert.glsl |   2 +-
 .../overlay_armature_envelope_solid_frag.glsl |   2 +-
 .../overlay_armature_envelope_solid_vert.glsl |   2 +-
 .../overlay_armature_shape_outline_vert.glsl  |   2 +-
 .../overlay_armature_shape_solid_frag.glsl    |   2 +-
 .../overlay_armature_shape_solid_vert.glsl    |   2 +-
 .../overlay_armature_shape_wire_frag.glsl     |   2 +-
 .../overlay_armature_shape_wire_vert.glsl     |   2 +-
 .../overlay_armature_sphere_outline_vert.glsl |   2 +-
 .../overlay_armature_sphere_solid_frag.glsl   |   2 +-
 .../overlay_armature_sphere_solid_vert.glsl   |   2 +-
 .../shaders/overlay_armature_stick_frag.glsl  |   2 +-
 .../shaders/overlay_armature_stick_vert.glsl  |   2 +-
 .../shaders/overlay_armature_wire_frag.glsl   |   2 +-
 .../shaders/overlay_armature_wire_vert.glsl   |   2 +-
 .../shaders/overlay_background_frag.glsl      |   2 +-
 .../shaders/overlay_clipbound_vert.glsl       |   2 +-
 .../overlay_depth_only_curves_vert.glsl       |   2 +-
 .../shaders/overlay_depth_only_frag.glsl      |   2 +-
 .../overlay_depth_only_gpencil_frag.glsl      |   2 +-
 .../overlay_depth_only_gpencil_vert.glsl      |   2 +-
 ...lay_depth_only_mesh_conservative_vert.glsl |   2 +-
 .../overlay_depth_only_pointcloud_vert.glsl   |   2 +-
 .../shaders/overlay_depth_only_vert.glsl      |   2 +-
 .../overlay_edit_curve_handle_vert.glsl       |   2 +-
 .../overlay_edit_curve_normals_vert.glsl      |   2 +-
 .../overlay_edit_curve_point_vert.glsl        |   2 +-
 .../shaders/overlay_edit_curve_wire_vert.glsl |   2 +-
 .../overlay_edit_curves_handle_vert.glsl      |   2 +-
 .../overlay_edit_gpencil_canvas_vert.glsl     |   2 +-
 .../overlay_edit_lattice_point_vert.glsl      |   2 +-
 .../overlay_edit_lattice_wire_vert.glsl       |   2 +-
 .../overlay_edit_mesh_analysis_frag.glsl      |   2 +-
 .../overlay_edit_mesh_analysis_vert.glsl      |   2 +-
 .../shaders/overlay_edit_mesh_common_lib.glsl |   2 +-
 .../shaders/overlay_edit_mesh_depth_vert.glsl |   2 +-
 .../shaders/overlay_edit_mesh_edge_vert.glsl  |   2 +-
 .../overlay_edit_mesh_facedot_vert.glsl       |   2 +-
 .../shaders/overlay_edit_mesh_frag.glsl       |   2 +-
 .../shaders/overlay_edit_mesh_lib.glsl        |   2 +-
 .../overlay_edit_mesh_normal_vert.glsl        |   2 +-
 .../overlay_edit_mesh_skin_root_vert.glsl     |   2 +-
 .../shaders/overlay_edit_mesh_vert.glsl       |   2 +-
 .../overlay_edit_particle_point_vert.glsl     |   2 +-
 .../overlay_edit_particle_strand_vert.glsl    |   2 +-
 .../shaders/overlay_edit_pointcloud_vert.glsl |   2 +-
 .../shaders/overlay_edit_uv_edges_frag.glsl   |   2 +-
 .../shaders/overlay_edit_uv_edges_vert.glsl   |   2 +-
 .../overlay_edit_uv_face_dots_vert.glsl       |   2 +-
 .../shaders/overlay_edit_uv_faces_vert.glsl   |   2 +-
 .../overlay_edit_uv_image_mask_frag.glsl      |   2 +-
 .../shaders/overlay_edit_uv_image_vert.glsl   |   2 +-
 .../overlay_edit_uv_stretching_vert.glsl      |   2 +-
 ...rlay_edit_uv_tiled_image_borders_vert.glsl |   2 +-
 .../shaders/overlay_edit_uv_verts_frag.glsl   |   2 +-
 .../shaders/overlay_edit_uv_verts_vert.glsl   |   2 +-
 .../overlay/shaders/overlay_extra_frag.glsl   |   2 +-
 .../overlay_extra_groundline_vert.glsl        |   2 +-
 .../overlay_extra_lightprobe_grid_vert.glsl   |   2 +-
 .../overlay_extra_loose_point_frag.glsl       |   2 +-
 .../overlay_extra_loose_point_vert.glsl       |   2 +-
 .../shaders/overlay_extra_point_vert.glsl     |   2 +-
 .../overlay/shaders/overlay_extra_vert.glsl   |   2 +-
 .../shaders/overlay_extra_wire_frag.glsl      |   2 +-
 .../shaders/overlay_extra_wire_vert.glsl      |   2 +-
 .../overlay/shaders/overlay_facing_frag.glsl  |   2 +-
 .../overlay/shaders/overlay_facing_vert.glsl  |   2 +-
 .../shaders/overlay_grid_background_frag.glsl |   2 +-
 .../overlay/shaders/overlay_grid_frag.glsl    |   2 +-
 .../overlay/shaders/overlay_grid_vert.glsl    |   2 +-
 .../overlay/shaders/overlay_image_frag.glsl   |   2 +-
 .../overlay/shaders/overlay_image_vert.glsl   |   2 +-
 .../overlay_motion_path_line_frag.glsl        |   2 +-
 .../overlay_motion_path_line_vert.glsl        |   2 +-
 .../overlay_motion_path_point_vert.glsl       |   2 +-
 .../shaders/overlay_outline_detect_frag.glsl  |   2 +-
 .../overlay_outline_prepass_curves_vert.glsl  |   2 +-
 .../shaders/overlay_outline_prepass_frag.glsl |   2 +-
 .../overlay_outline_prepass_gpencil_frag.glsl |   2 +-
 .../overlay_outline_prepass_gpencil_vert.glsl |   2 +-
 ...erlay_outline_prepass_pointcloud_vert.glsl |   2 +-
 .../shaders/overlay_outline_prepass_vert.glsl |   2 +-
 .../overlay_outline_prepass_wire_vert.glsl    |   2 +-
 .../shaders/overlay_paint_face_vert.glsl      |   2 +-
 .../shaders/overlay_paint_point_vert.glsl     |   2 +-
 .../shaders/overlay_paint_texture_frag.glsl   |   2 +-
 .../shaders/overlay_paint_texture_vert.glsl   |   2 +-
 .../shaders/overlay_paint_weight_frag.glsl    |   2 +-
 .../shaders/overlay_paint_weight_vert.glsl    |   2 +-
 .../shaders/overlay_paint_wire_vert.glsl      |   2 +-
 .../shaders/overlay_particle_frag.glsl        |   2 +-
 .../shaders/overlay_particle_hair_vert.glsl   |   2 +-
 .../shaders/overlay_particle_shape_frag.glsl  |   2 +-
 .../shaders/overlay_particle_shape_vert.glsl  |   2 +-
 .../shaders/overlay_particle_vert.glsl        |   2 +-
 .../overlay_point_varying_color_frag.glsl     |   2 +-
 ...varying_color_varying_outline_aa_frag.glsl |   2 +-
 .../overlay_sculpt_curves_cage_vert.glsl      |   2 +-
 .../overlay_sculpt_curves_selection_frag.glsl |   2 +-
 .../overlay_sculpt_curves_selection_vert.glsl |   2 +-
 .../shaders/overlay_sculpt_mask_frag.glsl     |   2 +-
 .../shaders/overlay_sculpt_mask_vert.glsl     |   2 +-
 .../shaders/overlay_uniform_color_frag.glsl   |   2 +-
 .../shaders/overlay_varying_color.glsl        |   2 +-
 .../overlay_viewer_attribute_curve_vert.glsl  |   2 +-
 .../overlay_viewer_attribute_curves_vert.glsl |   2 +-
 .../overlay_viewer_attribute_frag.glsl        |   2 +-
 .../overlay_viewer_attribute_mesh_vert.glsl   |   2 +-
 ...rlay_viewer_attribute_pointcloud_vert.glsl |   2 +-
 .../overlay_volume_gridlines_vert.glsl        |   2 +-
 .../shaders/overlay_volume_velocity_vert.glsl |   2 +-
 .../shaders/overlay_wireframe_frag.glsl       |   2 +-
 .../shaders/overlay_wireframe_vert.glsl       |   2 +-
 .../shaders/overlay_xray_fade_frag.glsl       |   2 +-
 .../{select_id_info.hh => select_id_infos.hh} |   0
 ...e_info.hh => workbench_composite_infos.hh} |   4 +-
 ...depth_info.hh => workbench_depth_infos.hh} |   2 +-
 ...=> workbench_effect_antialiasing_infos.hh} |   2 +-
 .../infos/workbench_effect_dof_info.hh        |   2 +-
 .../infos/workbench_effect_dof_infos.hh       |  93 +++++++++
 ...o.hh => workbench_effect_outline_infos.hh} |   2 +-
 ...ass_info.hh => workbench_prepass_infos.hh} |   4 +-
 ...adow_info.hh => workbench_shadow_infos.hh} |   6 +-
 ...=> workbench_transparent_resolve_infos.hh} |   2 +-
 ...lume_info.hh => workbench_volume_infos.hh} |   2 +-
 .../shaders/workbench_cavity_lib.glsl         |   2 +-
 .../shaders/workbench_composite_frag.glsl     |   2 +-
 .../workbench_effect_dof_blur1_frag.glsl      |   2 +-
 .../workbench_effect_dof_blur2_frag.glsl      |   2 +-
 .../workbench_effect_dof_downsample_frag.glsl |   2 +-
 .../workbench_effect_dof_prepare_frag.glsl    |   2 +-
 .../workbench_effect_dof_resolve_frag.glsl    |   2 +-
 .../workbench_effect_outline_frag.glsl        |   2 +-
 .../shaders/workbench_effect_smaa_frag.glsl   |   2 +-
 .../shaders/workbench_effect_smaa_vert.glsl   |   2 +-
 .../shaders/workbench_effect_taa_frag.glsl    |   2 +-
 .../shaders/workbench_image_lib.glsl          |   2 +-
 .../shaders/workbench_matcap_lib.glsl         |   2 +-
 .../shaders/workbench_material_lib.glsl       |   2 +-
 .../shaders/workbench_merge_depth_frag.glsl   |   2 +-
 .../shaders/workbench_overlay_depth_frag.glsl |   2 +-
 .../shaders/workbench_prepass_frag.glsl       |   2 +-
 .../shaders/workbench_prepass_hair_vert.glsl  |   2 +-
 .../workbench_prepass_pointcloud_vert.glsl    |   2 +-
 .../shaders/workbench_prepass_vert.glsl       |   2 +-
 .../shaders/workbench_shadow_caps_vert.glsl   |   2 +-
 .../shaders/workbench_shadow_debug_frag.glsl  |   2 +-
 .../shaders/workbench_shadow_lib.glsl         |   2 +-
 .../shaders/workbench_shadow_vert.glsl        |   2 +-
 .../workbench_shadow_visibility_comp.glsl     |   2 +-
 .../workbench_transparent_accum_frag.glsl     |   2 +-
 .../workbench_transparent_resolve_frag.glsl   |   2 +-
 .../shaders/workbench_volume_frag.glsl        |   2 +-
 .../shaders/workbench_volume_vert.glsl        |   2 +-
 .../shaders/workbench_world_light_lib.glsl    |   2 +-
 .../shaders/draw_command_generate_comp.glsl   |   2 +-
 .../draw/intern/shaders/draw_curves_info.hh   |   2 +-
 .../draw/intern/shaders/draw_curves_infos.hh  | 133 +++++++++++++
 .../draw_curves_interpolation_comp.glsl       |   2 +-
 .../draw_curves_length_intercept_comp.glsl    |   2 +-
 .../draw/intern/shaders/draw_curves_lib.glsl  |   2 +-
 .../draw/intern/shaders/draw_curves_test.glsl |   2 +-
 .../shaders/draw_curves_topology_comp.glsl    |   2 +-
 .../shaders/draw_debug_draw_display_frag.glsl |   2 +-
 .../shaders/draw_debug_draw_display_vert.glsl |   2 +-
 .../intern/shaders/draw_debug_draw_lib.glsl   |   2 +-
 ...draw_debug_info.hh => draw_debug_infos.hh} |   0
 .../shaders/draw_grease_pencil_lib.glsl       |   2 +-
 .../intern/shaders/draw_intersect_lib.glsl    |   2 +-
 .../draw/intern/shaders/draw_model_lib.glsl   |   2 +-
 ...fos_info.hh => draw_object_infos_infos.hh} |   2 +-
 .../intern/shaders/draw_object_infos_lib.glsl |   2 +-
 .../shaders/draw_resource_finalize_comp.glsl  |   2 +-
 .../shaders/draw_view_finalize_comp.glsl      |   2 +-
 .../{draw_view_info.hh => draw_view_infos.hh} |   0
 .../draw/intern/shaders/draw_view_lib.glsl    |   2 +-
 .../intern/shaders/draw_visibility_comp.glsl  |   2 +-
 .../{subdiv_info.hh => subdiv_infos.hh}       |   0
 .../draw/intern/shaders/subdiv_lib.glsl       |   2 +-
 source/blender/gpu/CMakeLists.txt             |  50 ++++-
 .../gpu/glsl_preprocess/glsl_preprocess.cc    |  39 ++--
 .../gpu/glsl_preprocess/glsl_preprocess.hh    |   7 +-
 .../gpu/intern/gpu_shader_create_info.cc      |   8 +-
 .../gpu/intern/gpu_shader_create_info_list.hh | 186 ------------------
 ...pdate_info.hh => depth_2d_update_infos.hh} |   0
 ...hh => gpu_shader_fullscreen_blit_infos.hh} |   0
 .../common/gpu_shader_fullscreen_vert.glsl    |   2 +-
 .../common/gpu_shader_index_load_lib.glsl     |   2 +-
 .../shaders/common/gpu_shader_print_lib.glsl  |   2 +-
 .../common/gpu_shader_sequencer_lib.glsl      |   2 +-
 .../gpu_shader_2D_area_borders_frag.glsl      |   2 +-
 .../gpu_shader_2D_area_borders_vert.glsl      |   2 +-
 .../gpu_shader_2D_image_rect_vert.glsl        |   2 +-
 .../gpu/shaders/gpu_shader_2D_image_vert.glsl |   2 +-
 .../gpu_shader_2D_line_dashed_frag.glsl       |   2 +-
 .../gpu_shader_2D_node_socket_frag.glsl       |   2 +-
 .../gpu_shader_2D_node_socket_vert.glsl       |   2 +-
 .../shaders/gpu_shader_2D_nodelink_frag.glsl  |   2 +-
 .../shaders/gpu_shader_2D_nodelink_vert.glsl  |   2 +-
 ..._shader_2D_point_uniform_size_aa_vert.glsl |   2 +-
 ...2D_point_uniform_size_outline_aa_vert.glsl |   2 +-
 ...point_varying_size_varying_color_vert.glsl |   2 +-
 .../gpu/shaders/gpu_shader_2D_vert.glsl       |   2 +-
 .../gpu_shader_2D_widget_base_frag.glsl       |   2 +-
 .../gpu_shader_2D_widget_base_vert.glsl       |   2 +-
 .../gpu_shader_2D_widget_shadow_frag.glsl     |   2 +-
 .../gpu_shader_2D_widget_shadow_vert.glsl     |   2 +-
 ..._shader_3D_clipped_uniform_color_vert.glsl |   2 +-
 .../gpu_shader_3D_flat_color_vert.glsl        |   2 +-
 .../gpu/shaders/gpu_shader_3D_image_vert.glsl |   2 +-
 ...der_3D_line_dashed_uniform_color_vert.glsl |   2 +-
 .../shaders/gpu_shader_3D_normal_vert.glsl    |   2 +-
 .../gpu_shader_3D_point_flat_color_vert.glsl  |   2 +-
 ..._shader_3D_point_uniform_size_aa_vert.glsl |   2 +-
 ...point_varying_size_varying_color_vert.glsl |   2 +-
 .../shaders/gpu_shader_3D_polyline_frag.glsl  |   2 +-
 .../shaders/gpu_shader_3D_polyline_vert.glsl  |   2 +-
 .../gpu_shader_3D_smooth_color_frag.glsl      |   2 +-
 .../gpu_shader_3D_smooth_color_vert.glsl      |   2 +-
 .../gpu/shaders/gpu_shader_3D_vert.glsl       |   2 +-
 .../gpu_shader_cfg_world_clip_lib.glsl        |   2 +-
 .../gpu/shaders/gpu_shader_checker_frag.glsl  |   2 +-
 .../shaders/gpu_shader_colorspace_lib.glsl    |   2 +-
 .../shaders/gpu_shader_depth_only_frag.glsl   |   2 +-
 .../shaders/gpu_shader_diag_stripes_frag.glsl |   2 +-
 .../gpu_shader_display_fallback_frag.glsl     |   2 +-
 .../gpu_shader_display_fallback_vert.glsl     |   2 +-
 .../shaders/gpu_shader_flat_color_frag.glsl   |   2 +-
 .../gpu_shader_gpencil_stroke_frag.glsl       |   2 +-
 .../gpu_shader_gpencil_stroke_vert.glsl       |   2 +-
 .../gpu/shaders/gpu_shader_icon_frag.glsl     |   2 +-
 .../shaders/gpu_shader_icon_multi_vert.glsl   |   2 +-
 .../gpu/shaders/gpu_shader_icon_vert.glsl     |   2 +-
 .../shaders/gpu_shader_image_color_frag.glsl  |   2 +-
 .../gpu_shader_image_desaturate_frag.glsl     |   2 +-
 .../gpu/shaders/gpu_shader_image_frag.glsl    |   2 +-
 .../gpu_shader_image_overlays_merge_frag.glsl |   2 +-
 ...ader_image_overlays_stereo_merge_frag.glsl |   2 +-
 .../gpu_shader_image_shuffle_color_frag.glsl  |   2 +-
 .../gpu_shader_index_2d_array_lines.glsl      |   2 +-
 .../gpu_shader_index_2d_array_points.glsl     |   2 +-
 .../gpu_shader_index_2d_array_tris.glsl       |   2 +-
 .../gpu_shader_keyframe_shape_frag.glsl       |   2 +-
 .../gpu_shader_keyframe_shape_vert.glsl       |   2 +-
 ...pu_shader_point_uniform_color_aa_frag.glsl |   2 +-
 ...r_point_uniform_color_outline_aa_frag.glsl |   2 +-
 .../gpu_shader_point_varying_color_frag.glsl  |   2 +-
 .../gpu_shader_sequencer_scope_comp.glsl      |   2 +-
 .../gpu_shader_sequencer_scope_frag.glsl      |   2 +-
 .../gpu_shader_sequencer_strips_frag.glsl     |   2 +-
 .../gpu_shader_sequencer_strips_vert.glsl     |   2 +-
 .../gpu_shader_sequencer_thumbs_frag.glsl     |   2 +-
 .../gpu_shader_sequencer_thumbs_vert.glsl     |   2 +-
 .../gpu_shader_sequencer_zebra_frag.glsl      |   2 +-
 .../gpu_shader_simple_lighting_frag.glsl      |   2 +-
 .../gpu/shaders/gpu_shader_text_frag.glsl     |   2 +-
 .../gpu/shaders/gpu_shader_text_vert.glsl     |   2 +-
 .../gpu_shader_uniform_color_frag.glsl        |   2 +-
 ...lanes_info.hh => gpu_clip_planes_infos.hh} |   0
 ...x_load_info.hh => gpu_index_load_infos.hh} |   0
 ...terface_info.hh => gpu_interface_infos.hh} |   0
 ...hh => gpu_shader_2D_area_borders_infos.hh} |   0
 ...info.hh => gpu_shader_2D_checker_infos.hh} |   0
 ...hh => gpu_shader_2D_diag_stripes_infos.hh} |   0
 ...shader_2D_image_desaturate_color_infos.hh} |   2 +-
 ...e_info.hh => gpu_shader_2D_image_infos.hh} |   4 +-
 ...u_shader_2D_image_overlays_merge_infos.hh} |   2 +-
 ...r_2D_image_overlays_stereo_merge_infos.hh} |   0
 ...> gpu_shader_2D_image_rect_color_infos.hh} |   4 +-
 ...pu_shader_2D_image_shuffle_color_infos.hh} |   2 +-
 ....hh => gpu_shader_2D_node_socket_infos.hh} |   0
 ...nfo.hh => gpu_shader_2D_nodelink_infos.hh} |   0
 ...nt_uniform_size_uniform_color_aa_infos.hh} |   4 +-
 ...rm_size_uniform_color_outline_aa_infos.hh} |   2 +-
 ...point_varying_size_varying_color_infos.hh} |   2 +-
 ..._info.hh => gpu_shader_2D_widget_infos.hh} |   4 +-
 ...o.hh => gpu_shader_3D_depth_only_infos.hh} |   4 +-
 ...o.hh => gpu_shader_3D_flat_color_infos.hh} |   6 +-
 ...e_info.hh => gpu_shader_3D_image_infos.hh} |   4 +-
 ...t_info.hh => gpu_shader_3D_point_infos.hh} |   6 +-
 ...nfo.hh => gpu_shader_3D_polyline_infos.hh} |   6 +-
 ...hh => gpu_shader_3D_smooth_color_infos.hh} |   6 +-
 ...h => gpu_shader_3D_uniform_color_infos.hh} |   4 +-
 ...info.hh => gpu_shader_fullscreen_infos.hh} |   0
 ....hh => gpu_shader_gpencil_stroke_infos.hh} |   0
 ..._icon_info.hh => gpu_shader_icon_infos.hh} |   2 +-
 ...ndex_info.hh => gpu_shader_index_infos.hh} |   2 +-
 ....hh => gpu_shader_keyframe_shape_infos.hh} |   0
 ...shader_line_dashed_uniform_color_infos.hh} |   4 +-
 ...rint_info.hh => gpu_shader_print_infos.hh} |   0
 ..._info.hh => gpu_shader_sequencer_infos.hh} |   4 +-
 ...hh => gpu_shader_simple_lighting_infos.hh} |   0
 ..._test_info.hh => gpu_shader_test_infos.hh} |   2 +-
 ..._text_info.hh => gpu_shader_text_infos.hh} |   2 +-
 ...=> gpu_srgb_to_framebuffer_space_infos.hh} |   2 +-
 .../shaders/vk_backbuffer_blit_comp.glsl      |   2 +-
 ...it_info.hh => vk_backbuffer_blit_infos.hh} |   0
 .../blender/imbuf/opencolorio/CMakeLists.txt  |   5 +
 569 files changed, 1195 insertions(+), 764 deletions(-)
 rename source/blender/compositor/shaders/infos/{compositor_alpha_crop_info.hh => compositor_alpha_crop_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_bilateral_blur_info.hh => compositor_bilateral_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_bokeh_blur_info.hh => compositor_bokeh_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_bokeh_blur_variable_size_info.hh => compositor_bokeh_blur_variable_size_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_bokeh_image_info.hh => compositor_bokeh_image_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_box_mask_info.hh => compositor_box_mask_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_compute_preview_info.hh => compositor_compute_preview_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_convert_info.hh => compositor_convert_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_cryptomatte_info.hh => compositor_cryptomatte_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_defocus_info.hh => compositor_defocus_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_deriche_gaussian_blur_info.hh => compositor_deriche_gaussian_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_despeckle_info.hh => compositor_despeckle_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_directional_blur_info.hh => compositor_directional_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_displace_info.hh => compositor_displace_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_double_edge_mask_info.hh => compositor_double_edge_mask_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_edge_filter_info.hh => compositor_edge_filter_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_ellipse_mask_info.hh => compositor_ellipse_mask_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_filter_info.hh => compositor_filter_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_flip_info.hh => compositor_flip_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_gamma_correct_info.hh => compositor_gamma_correct_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_glare_info.hh => compositor_glare_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_id_mask_info.hh => compositor_id_mask_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_image_coordinates_info.hh => compositor_image_coordinates_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_image_crop_info.hh => compositor_image_crop_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_inpaint_info.hh => compositor_inpaint_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_jump_flooding_info.hh => compositor_jump_flooding_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_keying_info.hh => compositor_keying_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_keying_screen_info.hh => compositor_keying_screen_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_kuwahara_info.hh => compositor_kuwahara_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_lens_distortion_info.hh => compositor_lens_distortion_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_map_uv_info.hh => compositor_map_uv_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_morphological_blur_info.hh => compositor_morphological_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_morphological_distance_feather_info.hh => compositor_morphological_distance_feather_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_morphological_distance_info.hh => compositor_morphological_distance_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_morphological_distance_threshold_info.hh => compositor_morphological_distance_threshold_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_morphological_step_info.hh => compositor_morphological_step_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_motion_blur_info.hh => compositor_motion_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_movie_distortion_info.hh => compositor_movie_distortion_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_normalize_info.hh => compositor_normalize_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_pad_info.hh => compositor_pad_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_parallel_reduction_info.hh => compositor_parallel_reduction_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_pixelate_info.hh => compositor_pixelate_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_plane_deform_info.hh => compositor_plane_deform_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_premultiply_alpha_info.hh => compositor_premultiply_alpha_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_read_input_info.hh => compositor_read_input_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_realize_on_domain_info.hh => compositor_realize_on_domain_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_sample_pixel_info.hh => compositor_sample_pixel_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_scale_variable_info.hh => compositor_scale_variable_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_smaa_info.hh => compositor_smaa_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_split_info.hh => compositor_split_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_summed_area_table_info.hh => compositor_summed_area_table_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_symmetric_blur_info.hh => compositor_symmetric_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_symmetric_blur_variable_size_info.hh => compositor_symmetric_blur_variable_size_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_symmetric_separable_blur_info.hh => compositor_symmetric_separable_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_symmetric_separable_blur_variable_size_info.hh => compositor_symmetric_separable_blur_variable_size_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_tone_map_photoreceptor_info.hh => compositor_tone_map_photoreceptor_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_tone_map_simple_info.hh => compositor_tone_map_simple_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_translate_wrapped_info.hh => compositor_translate_wrapped_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_van_vliet_gaussian_blur_info.hh => compositor_van_vliet_gaussian_blur_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_write_output_info.hh => compositor_write_output_infos.hh} (100%)
 rename source/blender/compositor/shaders/infos/{compositor_z_combine_info.hh => compositor_z_combine_infos.hh} (100%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_ambient_occlusion_info.hh => eevee_ambient_occlusion_infos.hh} (93%)
 create mode 100644 source/blender/draw/engines/eevee/shaders/infos/eevee_common_infos.hh
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_deferred_info.hh => eevee_deferred_infos.hh} (98%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_depth_of_field_info.hh => eevee_depth_of_field_infos.hh} (99%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_film_info.hh => eevee_film_infos.hh} (97%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_hiz_info.hh => eevee_hiz_infos.hh} (93%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_light_culling_info.hh => eevee_light_culling_infos.hh} (95%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_lightprobe_sphere_info.hh => eevee_lightprobe_sphere_infos.hh} (96%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_lightprobe_volume_info.hh => eevee_lightprobe_volume_infos.hh} (98%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_lookdev_info.hh => eevee_lookdev_infos.hh} (96%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_lut_info.hh => eevee_lut_infos.hh} (95%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_material_info.hh => eevee_material_infos.hh} (98%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_motion_blur_info.hh => eevee_motion_blur_infos.hh} (95%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_shadow_info.hh => eevee_shadow_infos.hh} (98%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_subsurface_info.hh => eevee_subsurface_infos.hh} (97%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_tracing_info.hh => eevee_tracing_infos.hh} (99%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_velocity_info.hh => eevee_velocity_infos.hh} (96%)
 rename source/blender/draw/engines/eevee/shaders/infos/{eevee_volume_info.hh => eevee_volume_infos.hh} (95%)
 rename source/blender/draw/engines/gpencil/shaders/infos/{gpencil_info.hh => gpencil_infos.hh} (98%)
 rename source/blender/draw/engines/gpencil/shaders/infos/{gpencil_vfx_info.hh => gpencil_vfx_infos.hh} (97%)
 rename source/blender/draw/engines/image/shaders/infos/{engine_image_info.hh => engine_image_infos.hh} (100%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_antialiasing_info.hh => overlay_antialiasing_infos.hh} (92%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_armature_info.hh => overlay_armature_infos.hh} (97%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_background_info.hh => overlay_background_infos.hh} (89%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_common_info.hh => overlay_common_infos.hh} (100%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_edit_mode_info.hh => overlay_edit_mode_infos.hh} (99%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_extra_info.hh => overlay_extra_infos.hh} (98%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_facing_info.hh => overlay_facing_infos.hh} (82%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_grid_info.hh => overlay_grid_infos.hh} (96%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_outline_info.hh => overlay_outline_infos.hh} (96%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_paint_info.hh => overlay_paint_infos.hh} (97%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_sculpt_curves_info.hh => overlay_sculpt_curves_infos.hh} (94%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_sculpt_info.hh => overlay_sculpt_infos.hh} (89%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_viewer_attribute_info.hh => overlay_viewer_attribute_infos.hh} (95%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_volume_info.hh => overlay_volume_infos.hh} (97%)
 rename source/blender/draw/engines/overlay/shaders/infos/{overlay_wireframe_info.hh => overlay_wireframe_infos.hh} (96%)
 rename source/blender/draw/engines/select/shaders/infos/{select_id_info.hh => select_id_infos.hh} (100%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_composite_info.hh => workbench_composite_infos.hh} (97%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_depth_info.hh => workbench_depth_infos.hh} (93%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_effect_antialiasing_info.hh => workbench_effect_antialiasing_infos.hh} (98%)
 create mode 100644 source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_infos.hh
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_effect_outline_info.hh => workbench_effect_outline_infos.hh} (93%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_prepass_info.hh => workbench_prepass_infos.hh} (98%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_shadow_info.hh => workbench_shadow_infos.hh} (97%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_transparent_resolve_info.hh => workbench_transparent_resolve_infos.hh} (92%)
 rename source/blender/draw/engines/workbench/shaders/infos/{workbench_volume_info.hh => workbench_volume_infos.hh} (99%)
 create mode 100644 source/blender/draw/intern/shaders/draw_curves_infos.hh
 rename source/blender/draw/intern/shaders/{draw_debug_info.hh => draw_debug_infos.hh} (100%)
 rename source/blender/draw/intern/shaders/{draw_object_infos_info.hh => draw_object_infos_infos.hh} (98%)
 rename source/blender/draw/intern/shaders/{draw_view_info.hh => draw_view_infos.hh} (100%)
 rename source/blender/draw/intern/shaders/{subdiv_info.hh => subdiv_infos.hh} (100%)
 delete mode 100644 source/blender/gpu/intern/gpu_shader_create_info_list.hh
 rename source/blender/gpu/metal/kernels/{depth_2d_update_info.hh => depth_2d_update_infos.hh} (100%)
 rename source/blender/gpu/metal/kernels/{gpu_shader_fullscreen_blit_info.hh => gpu_shader_fullscreen_blit_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_clip_planes_info.hh => gpu_clip_planes_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_index_load_info.hh => gpu_index_load_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_interface_info.hh => gpu_interface_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_area_borders_info.hh => gpu_shader_2D_area_borders_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_checker_info.hh => gpu_shader_2D_checker_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_diag_stripes_info.hh => gpu_shader_2D_diag_stripes_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_desaturate_color_info.hh => gpu_shader_2D_image_desaturate_color_infos.hh} (92%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_info.hh => gpu_shader_2D_image_infos.hh} (88%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_overlays_merge_info.hh => gpu_shader_2D_image_overlays_merge_infos.hh} (97%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_overlays_stereo_merge_info.hh => gpu_shader_2D_image_overlays_stereo_merge_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_rect_color_info.hh => gpu_shader_2D_image_rect_color_infos.hh} (90%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_image_shuffle_color_info.hh => gpu_shader_2D_image_shuffle_color_infos.hh} (92%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_node_socket_info.hh => gpu_shader_2D_node_socket_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_nodelink_info.hh => gpu_shader_2D_nodelink_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh => gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh} (89%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh => gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh} (96%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_point_varying_size_varying_color_info.hh => gpu_shader_2D_point_varying_size_varying_color_infos.hh} (95%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_2D_widget_info.hh => gpu_shader_2D_widget_infos.hh} (96%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_depth_only_info.hh => gpu_shader_3D_depth_only_infos.hh} (91%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_flat_color_info.hh => gpu_shader_3D_flat_color_infos.hh} (87%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_image_info.hh => gpu_shader_3D_image_infos.hh} (92%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_point_info.hh => gpu_shader_3D_point_infos.hh} (94%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_polyline_info.hh => gpu_shader_3D_polyline_infos.hh} (95%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_smooth_color_info.hh => gpu_shader_3D_smooth_color_infos.hh} (87%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_3D_uniform_color_info.hh => gpu_shader_3D_uniform_color_infos.hh} (94%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_fullscreen_info.hh => gpu_shader_fullscreen_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_gpencil_stroke_info.hh => gpu_shader_gpencil_stroke_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_icon_info.hh => gpu_shader_icon_infos.hh} (97%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_index_info.hh => gpu_shader_index_infos.hh} (97%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_keyframe_shape_info.hh => gpu_shader_keyframe_shape_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_line_dashed_uniform_color_info.hh => gpu_shader_line_dashed_uniform_color_infos.hh} (95%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_print_info.hh => gpu_shader_print_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_sequencer_info.hh => gpu_shader_sequencer_infos.hh} (97%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_simple_lighting_info.hh => gpu_shader_simple_lighting_infos.hh} (100%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_test_info.hh => gpu_shader_test_infos.hh} (99%)
 rename source/blender/gpu/shaders/infos/{gpu_shader_text_info.hh => gpu_shader_text_infos.hh} (95%)
 rename source/blender/gpu/shaders/infos/{gpu_srgb_to_framebuffer_space_info.hh => gpu_srgb_to_framebuffer_space_infos.hh} (88%)
 rename source/blender/gpu/vulkan/shaders/{vk_backbuffer_blit_info.hh => vk_backbuffer_blit_infos.hh} (100%)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 1b03c0fe81e..32c4a006ade 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1061,6 +1061,7 @@ function(glsl_to_c
   get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}    REALPATH)
   get_filename_component(_file_tmp  ${CMAKE_CURRENT_BINARY_DIR}/${file_from}    REALPATH)
   get_filename_component(_file_meta ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.hh REALPATH)
+  get_filename_component(_file_info ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.info  REALPATH)
   get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c  REALPATH)
 
   list(APPEND ${list_to_add} ${_file_to})
@@ -1071,14 +1072,15 @@ function(glsl_to_c
   get_filename_component(_file_to_path ${_file_to} PATH)
 
   add_custom_command(
-    OUTPUT  ${_file_to} ${_file_meta}
-    COMMAND "$<TARGET_FILE:glsl_preprocess>" ${_file_from} ${_file_tmp} ${_file_meta}
+    OUTPUT  ${_file_to} ${_file_meta} ${_file_info}
+    COMMAND "$<TARGET_FILE:glsl_preprocess>" ${_file_from} ${_file_tmp} ${_file_meta} ${_file_info}
     COMMAND "$<TARGET_FILE:datatoc>" ${_file_tmp} ${_file_to}
     DEPENDS ${_file_from} datatoc glsl_preprocess)
 
   set_source_files_properties(${_file_tmp} PROPERTIES GENERATED TRUE)
   set_source_files_properties(${_file_to}  PROPERTIES GENERATED TRUE)
   set_source_files_properties(${_file_meta}  PROPERTIES GENERATED TRUE)
+  set_source_files_properties(${_file_info}  PROPERTIES GENERATED TRUE)
 endfunction()
 
 
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index f569262b701..38fdd291d39 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -103,11 +103,13 @@ if(WITH_OPENSUBDIV)
 
   set(GLSL_SOURCE_CONTENT "")
   set(GLSL_METADATA_CONTENT "")
+  set(GLSL_INFOS_CONTENT "")
   foreach(GLSL_FILE ${GLSL_SRC})
     get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
     string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
     string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
     string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
+    string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
   endforeach()
 
   set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_source_list.h")
@@ -116,6 +118,9 @@ if(WITH_OPENSUBDIV)
   set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_metadata_list.hh")
   file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
   list(APPEND SRC ${glsl_metadata_list_file})
+  set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_infos_list.hh")
+  file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
+  list(APPEND SRC ${glsl_infos_list_file})
   list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
 
   target_include_directories(bf_osd_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 2c859f1deec..e4e5733e864 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -167,6 +167,68 @@ set(LIB
 )
 
 set(GLSL_SRC
+  shaders/infos/compositor_alpha_crop_infos.hh
+  shaders/infos/compositor_bilateral_blur_infos.hh
+  shaders/infos/compositor_bokeh_blur_infos.hh
+  shaders/infos/compositor_bokeh_blur_variable_size_infos.hh
+  shaders/infos/compositor_bokeh_image_infos.hh
+  shaders/infos/compositor_box_mask_infos.hh
+  shaders/infos/compositor_compute_preview_infos.hh
+  shaders/infos/compositor_convert_infos.hh
+  shaders/infos/compositor_cryptomatte_infos.hh
+  shaders/infos/compositor_defocus_infos.hh
+  shaders/infos/compositor_deriche_gaussian_blur_infos.hh
+  shaders/infos/compositor_despeckle_infos.hh
+  shaders/infos/compositor_directional_blur_infos.hh
+  shaders/infos/compositor_displace_infos.hh
+  shaders/infos/compositor_double_edge_mask_infos.hh
+  shaders/infos/compositor_edge_filter_infos.hh
+  shaders/infos/compositor_ellipse_mask_infos.hh
+  shaders/infos/compositor_filter_infos.hh
+  shaders/infos/compositor_flip_infos.hh
+  shaders/infos/compositor_gamma_correct_infos.hh
+  shaders/infos/compositor_glare_infos.hh
+  shaders/infos/compositor_id_mask_infos.hh
+  shaders/infos/compositor_image_coordinates_infos.hh
+  shaders/infos/compositor_image_crop_infos.hh
+  shaders/infos/compositor_inpaint_infos.hh
+  shaders/infos/compositor_jump_flooding_infos.hh
+  shaders/infos/compositor_keying_infos.hh
+  shaders/infos/compositor_keying_screen_infos.hh
+  shaders/infos/compositor_kuwahara_infos.hh
+  shaders/infos/compositor_lens_distortion_infos.hh
+  shaders/infos/compositor_map_uv_infos.hh
+  shaders/infos/compositor_morphological_blur_infos.hh
+  shaders/infos/compositor_morphological_distance_feather_infos.hh
+  shaders/infos/compositor_morphological_distance_infos.hh
+  shaders/infos/compositor_morphological_distance_threshold_infos.hh
+  shaders/infos/compositor_morphological_step_infos.hh
+  shaders/infos/compositor_motion_blur_infos.hh
+  shaders/infos/compositor_movie_distortion_infos.hh
+  shaders/infos/compositor_normalize_infos.hh
+  shaders/infos/compositor_pad_infos.hh
+  shaders/infos/compositor_parallel_reduction_infos.hh
+  shaders/infos/compositor_pixelate_infos.hh
+  shaders/infos/compositor_plane_deform_infos.hh
+  shaders/infos/compositor_premultiply_alpha_infos.hh
+  shaders/infos/compositor_read_input_infos.hh
+  shaders/infos/compositor_realize_on_domain_infos.hh
+  shaders/infos/compositor_sample_pixel_infos.hh
+  shaders/infos/compositor_scale_variable_infos.hh
+  shaders/infos/compositor_smaa_infos.hh
+  shaders/infos/compositor_split_infos.hh
+  shaders/infos/compositor_summed_area_table_infos.hh
+  shaders/infos/compositor_symmetric_blur_infos.hh
+  shaders/infos/compositor_symmetric_blur_variable_size_infos.hh
+  shaders/infos/compositor_symmetric_separable_blur_infos.hh
+  shaders/infos/compositor_symmetric_separable_blur_variable_size_infos.hh
+  shaders/infos/compositor_tone_map_photoreceptor_infos.hh
+  shaders/infos/compositor_tone_map_simple_infos.hh
+  shaders/infos/compositor_translate_wrapped_infos.hh
+  shaders/infos/compositor_van_vliet_gaussian_blur_infos.hh
+  shaders/infos/compositor_write_output_infos.hh
+  shaders/infos/compositor_z_combine_infos.hh
+
   shaders/compositor_alpha_crop.glsl
   shaders/compositor_bilateral_blur.glsl
   shaders/compositor_bokeh_blur.glsl
@@ -325,11 +387,13 @@ list(APPEND LIB
 
 set(GLSL_SOURCE_CONTENT "")
 set(GLSL_METADATA_CONTENT "")
+set(GLSL_INFOS_CONTENT "")
 foreach(GLSL_FILE ${GLSL_SRC})
   get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
   string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
   string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
   string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
+  string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
 endforeach()
 
 set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_source_list.h")
@@ -338,6 +402,9 @@ list(APPEND SRC ${glsl_source_list_file})
 set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_metadata_list.hh")
 file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
 list(APPEND SRC ${glsl_metadata_list_file})
+set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_infos_list.hh")
+file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
+list(APPEND SRC ${glsl_infos_list_file})
 list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_include_directories(bf_compositor_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/source/blender/compositor/shaders/compositor_parallel_reduction.glsl b/source/blender/compositor/shaders/compositor_parallel_reduction.glsl
index 47081961f88..e0c2bd4dde1 100644
--- a/source/blender/compositor/shaders/compositor_parallel_reduction.glsl
+++ b/source/blender/compositor/shaders/compositor_parallel_reduction.glsl
@@ -39,7 +39,7 @@
  * The shader is generic enough to implement many types of reductions. This is done by using macros
  * that the developer should define to implement a certain reduction operation. Those include,
  * TYPE, IDENTITY, INITIALIZE, LOAD, REDUCE, and WRITE. See the implementation below for more
- * information as well as the compositor_parallel_reduction_info.hh for example reductions
+ * information as well as the compositor_parallel_reduction_infos.hh for example reductions
  * operations. */
 
 /* Doing the reduction in shared memory is faster, so create a shared array where the whole data
diff --git a/source/blender/compositor/shaders/infos/compositor_alpha_crop_info.hh b/source/blender/compositor/shaders/infos/compositor_alpha_crop_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_alpha_crop_info.hh
rename to source/blender/compositor/shaders/infos/compositor_alpha_crop_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_bilateral_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_bilateral_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_bilateral_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_bilateral_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_bokeh_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_bokeh_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_bokeh_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh
rename to source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_bokeh_image_info.hh b/source/blender/compositor/shaders/infos/compositor_bokeh_image_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_bokeh_image_info.hh
rename to source/blender/compositor/shaders/infos/compositor_bokeh_image_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_box_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_box_mask_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_box_mask_info.hh
rename to source/blender/compositor/shaders/infos/compositor_box_mask_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_compute_preview_info.hh b/source/blender/compositor/shaders/infos/compositor_compute_preview_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_compute_preview_info.hh
rename to source/blender/compositor/shaders/infos/compositor_compute_preview_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_convert_info.hh b/source/blender/compositor/shaders/infos/compositor_convert_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_convert_info.hh
rename to source/blender/compositor/shaders/infos/compositor_convert_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh b/source/blender/compositor/shaders/infos/compositor_cryptomatte_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh
rename to source/blender/compositor/shaders/infos/compositor_cryptomatte_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_defocus_info.hh b/source/blender/compositor/shaders/infos/compositor_defocus_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_defocus_info.hh
rename to source/blender/compositor/shaders/infos/compositor_defocus_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_despeckle_info.hh b/source/blender/compositor/shaders/infos/compositor_despeckle_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_despeckle_info.hh
rename to source/blender/compositor/shaders/infos/compositor_despeckle_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_directional_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_directional_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_directional_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_directional_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_displace_info.hh b/source/blender/compositor/shaders/infos/compositor_displace_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_displace_info.hh
rename to source/blender/compositor/shaders/infos/compositor_displace_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_double_edge_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_double_edge_mask_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_double_edge_mask_info.hh
rename to source/blender/compositor/shaders/infos/compositor_double_edge_mask_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_edge_filter_info.hh b/source/blender/compositor/shaders/infos/compositor_edge_filter_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_edge_filter_info.hh
rename to source/blender/compositor/shaders/infos/compositor_edge_filter_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_ellipse_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_ellipse_mask_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_ellipse_mask_info.hh
rename to source/blender/compositor/shaders/infos/compositor_ellipse_mask_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_filter_info.hh b/source/blender/compositor/shaders/infos/compositor_filter_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_filter_info.hh
rename to source/blender/compositor/shaders/infos/compositor_filter_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_flip_info.hh b/source/blender/compositor/shaders/infos/compositor_flip_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_flip_info.hh
rename to source/blender/compositor/shaders/infos/compositor_flip_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_gamma_correct_info.hh b/source/blender/compositor/shaders/infos/compositor_gamma_correct_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_gamma_correct_info.hh
rename to source/blender/compositor/shaders/infos/compositor_gamma_correct_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_glare_info.hh b/source/blender/compositor/shaders/infos/compositor_glare_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_glare_info.hh
rename to source/blender/compositor/shaders/infos/compositor_glare_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_id_mask_info.hh b/source/blender/compositor/shaders/infos/compositor_id_mask_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_id_mask_info.hh
rename to source/blender/compositor/shaders/infos/compositor_id_mask_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_image_coordinates_info.hh b/source/blender/compositor/shaders/infos/compositor_image_coordinates_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_image_coordinates_info.hh
rename to source/blender/compositor/shaders/infos/compositor_image_coordinates_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_image_crop_info.hh b/source/blender/compositor/shaders/infos/compositor_image_crop_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_image_crop_info.hh
rename to source/blender/compositor/shaders/infos/compositor_image_crop_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_inpaint_info.hh b/source/blender/compositor/shaders/infos/compositor_inpaint_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_inpaint_info.hh
rename to source/blender/compositor/shaders/infos/compositor_inpaint_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_jump_flooding_info.hh b/source/blender/compositor/shaders/infos/compositor_jump_flooding_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_jump_flooding_info.hh
rename to source/blender/compositor/shaders/infos/compositor_jump_flooding_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_keying_info.hh b/source/blender/compositor/shaders/infos/compositor_keying_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_keying_info.hh
rename to source/blender/compositor/shaders/infos/compositor_keying_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_keying_screen_info.hh b/source/blender/compositor/shaders/infos/compositor_keying_screen_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_keying_screen_info.hh
rename to source/blender/compositor/shaders/infos/compositor_keying_screen_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_kuwahara_info.hh b/source/blender/compositor/shaders/infos/compositor_kuwahara_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_kuwahara_info.hh
rename to source/blender/compositor/shaders/infos/compositor_kuwahara_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_lens_distortion_info.hh b/source/blender/compositor/shaders/infos/compositor_lens_distortion_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_lens_distortion_info.hh
rename to source/blender/compositor/shaders/infos/compositor_lens_distortion_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_map_uv_info.hh b/source/blender/compositor/shaders/infos/compositor_map_uv_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_map_uv_info.hh
rename to source/blender/compositor/shaders/infos/compositor_map_uv_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_morphological_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_morphological_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_morphological_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_info.hh
rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_morphological_distance_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_morphological_distance_info.hh
rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh
rename to source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_morphological_step_info.hh b/source/blender/compositor/shaders/infos/compositor_morphological_step_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_morphological_step_info.hh
rename to source/blender/compositor/shaders/infos/compositor_morphological_step_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_motion_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_motion_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_motion_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_motion_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_movie_distortion_info.hh b/source/blender/compositor/shaders/infos/compositor_movie_distortion_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_movie_distortion_info.hh
rename to source/blender/compositor/shaders/infos/compositor_movie_distortion_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_normalize_info.hh b/source/blender/compositor/shaders/infos/compositor_normalize_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_normalize_info.hh
rename to source/blender/compositor/shaders/infos/compositor_normalize_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_pad_info.hh b/source/blender/compositor/shaders/infos/compositor_pad_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_pad_info.hh
rename to source/blender/compositor/shaders/infos/compositor_pad_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_parallel_reduction_info.hh b/source/blender/compositor/shaders/infos/compositor_parallel_reduction_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_parallel_reduction_info.hh
rename to source/blender/compositor/shaders/infos/compositor_parallel_reduction_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_pixelate_info.hh b/source/blender/compositor/shaders/infos/compositor_pixelate_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_pixelate_info.hh
rename to source/blender/compositor/shaders/infos/compositor_pixelate_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_plane_deform_info.hh b/source/blender/compositor/shaders/infos/compositor_plane_deform_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_plane_deform_info.hh
rename to source/blender/compositor/shaders/infos/compositor_plane_deform_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_premultiply_alpha_info.hh b/source/blender/compositor/shaders/infos/compositor_premultiply_alpha_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_premultiply_alpha_info.hh
rename to source/blender/compositor/shaders/infos/compositor_premultiply_alpha_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_read_input_info.hh b/source/blender/compositor/shaders/infos/compositor_read_input_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_read_input_info.hh
rename to source/blender/compositor/shaders/infos/compositor_read_input_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_realize_on_domain_info.hh b/source/blender/compositor/shaders/infos/compositor_realize_on_domain_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_realize_on_domain_info.hh
rename to source/blender/compositor/shaders/infos/compositor_realize_on_domain_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_sample_pixel_info.hh b/source/blender/compositor/shaders/infos/compositor_sample_pixel_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_sample_pixel_info.hh
rename to source/blender/compositor/shaders/infos/compositor_sample_pixel_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_scale_variable_info.hh b/source/blender/compositor/shaders/infos/compositor_scale_variable_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_scale_variable_info.hh
rename to source/blender/compositor/shaders/infos/compositor_scale_variable_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_smaa_info.hh b/source/blender/compositor/shaders/infos/compositor_smaa_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_smaa_info.hh
rename to source/blender/compositor/shaders/infos/compositor_smaa_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_split_info.hh b/source/blender/compositor/shaders/infos/compositor_split_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_split_info.hh
rename to source/blender/compositor/shaders/infos/compositor_split_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_summed_area_table_info.hh b/source/blender/compositor/shaders/infos/compositor_summed_area_table_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_summed_area_table_info.hh
rename to source/blender/compositor/shaders/infos/compositor_summed_area_table_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_symmetric_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_symmetric_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_symmetric_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh
rename to source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh b/source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh
rename to source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh b/source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh
rename to source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_tone_map_simple_info.hh b/source/blender/compositor/shaders/infos/compositor_tone_map_simple_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_tone_map_simple_info.hh
rename to source/blender/compositor/shaders/infos/compositor_tone_map_simple_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_translate_wrapped_info.hh b/source/blender/compositor/shaders/infos/compositor_translate_wrapped_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_translate_wrapped_info.hh
rename to source/blender/compositor/shaders/infos/compositor_translate_wrapped_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh b/source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh
rename to source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_write_output_info.hh b/source/blender/compositor/shaders/infos/compositor_write_output_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_write_output_info.hh
rename to source/blender/compositor/shaders/infos/compositor_write_output_infos.hh
diff --git a/source/blender/compositor/shaders/infos/compositor_z_combine_info.hh b/source/blender/compositor/shaders/infos/compositor_z_combine_infos.hh
similarity index 100%
rename from source/blender/compositor/shaders/infos/compositor_z_combine_info.hh
rename to source/blender/compositor/shaders/infos/compositor_z_combine_infos.hh
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 51738d6b9e3..577ac50a4a8 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -313,6 +313,64 @@ set(LIB
 )
 
 set(GLSL_SRC
+  intern/shaders/draw_curves_infos.hh
+  intern/shaders/draw_debug_infos.hh
+  intern/shaders/draw_object_infos_infos.hh
+  intern/shaders/draw_view_infos.hh
+  intern/shaders/subdiv_infos.hh
+
+  engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
+  engines/eevee/shaders/infos/eevee_common_infos.hh
+  engines/eevee/shaders/infos/eevee_deferred_infos.hh
+  engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
+  engines/eevee/shaders/infos/eevee_film_infos.hh
+  engines/eevee/shaders/infos/eevee_hiz_infos.hh
+  engines/eevee/shaders/infos/eevee_light_culling_infos.hh
+  engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
+  engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
+  engines/eevee/shaders/infos/eevee_lookdev_infos.hh
+  engines/eevee/shaders/infos/eevee_lut_infos.hh
+  engines/eevee/shaders/infos/eevee_material_infos.hh
+  engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
+  engines/eevee/shaders/infos/eevee_shadow_infos.hh
+  engines/eevee/shaders/infos/eevee_subsurface_infos.hh
+  engines/eevee/shaders/infos/eevee_tracing_infos.hh
+  engines/eevee/shaders/infos/eevee_velocity_infos.hh
+  engines/eevee/shaders/infos/eevee_volume_infos.hh
+
+  engines/image/shaders/infos/engine_image_infos.hh
+
+  engines/gpencil/shaders/infos/gpencil_infos.hh
+  engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
+
+  engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
+  engines/overlay/shaders/infos/overlay_armature_infos.hh
+  engines/overlay/shaders/infos/overlay_background_infos.hh
+  engines/overlay/shaders/infos/overlay_common_infos.hh
+  engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
+  engines/overlay/shaders/infos/overlay_extra_infos.hh
+  engines/overlay/shaders/infos/overlay_facing_infos.hh
+  engines/overlay/shaders/infos/overlay_grid_infos.hh
+  engines/overlay/shaders/infos/overlay_outline_infos.hh
+  engines/overlay/shaders/infos/overlay_paint_infos.hh
+  engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
+  engines/overlay/shaders/infos/overlay_sculpt_infos.hh
+  engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
+  engines/overlay/shaders/infos/overlay_volume_infos.hh
+  engines/overlay/shaders/infos/overlay_wireframe_infos.hh
+
+  engines/select/shaders/infos/select_id_infos.hh
+
+  engines/workbench/shaders/infos/workbench_composite_infos.hh
+  engines/workbench/shaders/infos/workbench_depth_infos.hh
+  engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
+  engines/workbench/shaders/infos/workbench_effect_dof_infos.hh
+  engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
+  engines/workbench/shaders/infos/workbench_prepass_infos.hh
+  engines/workbench/shaders/infos/workbench_shadow_infos.hh
+  engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
+  engines/workbench/shaders/infos/workbench_volume_infos.hh
+
   engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
   engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
   engines/eevee/shaders/eevee_attributes_curves_lib.glsl
@@ -771,11 +829,13 @@ list(APPEND LIB
 
 set(GLSL_SOURCE_CONTENT "")
 set(GLSL_METADATA_CONTENT "")
+set(GLSL_INFOS_CONTENT "")
 foreach(GLSL_FILE ${GLSL_SRC})
   get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
   string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
   string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
   string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
+  string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
 endforeach()
 
 set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_source_list.h")
@@ -784,6 +844,9 @@ list(APPEND SRC ${glsl_source_list_file})
 set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_metadata_list.hh")
 file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
 list(APPEND SRC ${glsl_metadata_list_file})
+set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_infos_list.hh")
+file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
+list(APPEND SRC ${glsl_infos_list_file})
 list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_include_directories(bf_draw_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
index fe8bfe598a7..e225eb81a72 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
 SHADER_LIBRARY_CREATE_INFO(eevee_hiz_data)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
index 839144665b3..505908345bf 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_ambient_occlusion_info.hh"
+#include "infos/eevee_ambient_occlusion_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ambient_occlusion_pass)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl
index 462666ec765..7812ac864bb 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 #  define CURVES_SHADER
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_mesh_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_mesh_lib.glsl
index 31fbeebd7fd..7bf8c86e6b9 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_mesh_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_mesh_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_pointcloud_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_pointcloud_lib.glsl
index cdf713f077c..b654254b2f5 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_pointcloud_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_pointcloud_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 #  define POINTCLOUD_SHADER
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl
index 046ff33fb51..fa5be7999a3 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_bxdf_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_bxdf_lib.glsl
index 2b602fcd3c3..43e2b13fbae 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_bxdf_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_bxdf_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 /**
  * BxDF evaluation functions.
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_bxdf_microfacet_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_bxdf_microfacet_lib.glsl
index d5d29a27e4d..6c1d22ebba9 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_bxdf_microfacet_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_bxdf_microfacet_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_camera_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_camera_lib.glsl
index d352fb0a845..603b6def16f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_camera_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_camera_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 /**
  * Camera projection / uv functions and utils.
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_cryptomatte_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_cryptomatte_lib.glsl
index aad4349a3fd..2a84c4e0152 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_cryptomatte_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_cryptomatte_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_film)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_debug_gbuffer_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_debug_gbuffer_frag.glsl
index fa641292fe8..634b95cc37d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_debug_gbuffer_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_debug_gbuffer_frag.glsl
@@ -7,7 +7,7 @@
  * This also fills the different render passes.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_debug_gbuffer)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_frag.glsl
index c25b279aaa0..8a26294067c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_debug_irradiance_grid)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_vert.glsl
index 960f0af6a38..839d2bdeea9 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_debug_irradiance_grid)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_frag.glsl
index 455d2929f93..c13ccf20875 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_debug_surfels)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_vert.glsl
index 6e695c1deec..8bb36127d3e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_debug_surfels)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_aov_clear_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_aov_clear_frag.glsl
index 35339056c21..c5e4c05b91c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_aov_clear_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_aov_clear_frag.glsl
@@ -11,7 +11,7 @@
  * AOVs for the pixel affected by the next layer using stencil test after the prepass.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_aov_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_capture_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_capture_frag.glsl
index bf0c3aa3198..88a1ae6d96a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_capture_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_capture_frag.glsl
@@ -6,7 +6,7 @@
  * Compute light objects lighting contribution using captured Gbuffer data.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_capture_eval)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_combine_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_combine_frag.glsl
index 98796e3fff6..416cf981c75 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_combine_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_combine_frag.glsl
@@ -7,7 +7,7 @@
  * This also fills the different render passes.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_combine)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_light_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_light_frag.glsl
index 65bdc291086..588979a013f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_light_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_light_frag.glsl
@@ -6,7 +6,7 @@
  * Compute light objects lighting contribution using Gbuffer data.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_light)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_planar_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_planar_frag.glsl
index 7a39c479444..1db0c3e98cd 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_planar_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_planar_frag.glsl
@@ -6,7 +6,7 @@
  * Compute light objects lighting contribution using captured Gbuffer data.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_planar_eval)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_thickness_amend_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_thickness_amend_frag.glsl
index eb30fb3465e..8c6d18df3ea 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_thickness_amend_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_thickness_amend_frag.glsl
@@ -10,7 +10,7 @@
  * - tilemaps_tx
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_thickness_amend)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_deferred_tile_classify_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_deferred_tile_classify_frag.glsl
index 74f4710fd18..cadea1575a1 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_deferred_tile_classify_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_deferred_tile_classify_frag.glsl
@@ -7,7 +7,7 @@
  * lighting complexity.
  */
 
-#include "infos/eevee_deferred_info.hh"
+#include "infos/eevee_deferred_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_tile_classify)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_accumulator_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_accumulator_lib.glsl
index 743d309151e..67863c15e16 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_accumulator_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_accumulator_lib.glsl
@@ -10,7 +10,7 @@
  * One is for the half-resolution gather passes and the other one for slight in focus regions.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_depth_of_field_lut)
 #ifdef GPU_LIBRARY_SHADER
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_bokeh_lut_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_bokeh_lut_comp.glsl
index 935d75472d2..7da0f1acafd 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_bokeh_lut_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_bokeh_lut_comp.glsl
@@ -10,7 +10,7 @@
  * as it is way more complex and expensive to do.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_bokeh_lut)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_downsample_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_downsample_comp.glsl
index ea3950cec4c..e952f8941ef 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_downsample_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_downsample_comp.glsl
@@ -9,7 +9,7 @@
  * Also does not weight luma for the bilateral weights.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_downsample)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_filter_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_filter_comp.glsl
index c2fa4eb1bf9..bec41b9f8be 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_filter_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_filter_comp.glsl
@@ -9,7 +9,7 @@
  * cheaper.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_filter)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_gather_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_gather_comp.glsl
index efe9ad150a3..6eb868fcf17 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_gather_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_gather_comp.glsl
@@ -15,7 +15,7 @@
  * - Color * Weight, Weight, Occlusion 'CoC' Depth (mean and variance)
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_gather)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_hole_fill_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_hole_fill_comp.glsl
index 56153a532c5..f8c5ec85b02 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_hole_fill_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_hole_fill_comp.glsl
@@ -12,7 +12,7 @@
  * rotation to ensure maximum coverage.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_hole_fill)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_lib.glsl
index 2d0eb12910c..aab543a4eef 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_lib.glsl
@@ -8,7 +8,7 @@
  * Depth of Field utils.
  */
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "gpu_shader_math_base_lib.glsl"
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_reduce_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_reduce_comp.glsl
index 24535590857..00b3b69b591 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_reduce_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_reduce_comp.glsl
@@ -15,7 +15,7 @@
  * - Gather input color (whole mip chain), Scatter rect list, Signed CoC (whole mip chain).
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_reduce)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_resolve_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_resolve_comp.glsl
index 5093357d916..15ce92913cb 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_resolve_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_resolve_comp.glsl
@@ -11,7 +11,7 @@
  * in-focus and defocus regions.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_resolve)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_frag.glsl
index 7a790f1122e..e269250ff7d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_frag.glsl
@@ -9,7 +9,7 @@
  * invocations and overdraw.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_depth_of_field_scatter)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_vert.glsl
index 8cbcf5489c3..e516a7853f8 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_vert.glsl
@@ -9,7 +9,7 @@
  * invocations and overdraw.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_depth_of_field_scatter)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_setup_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_setup_comp.glsl
index 6b77680e9b8..156cf9ffa83 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_setup_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_setup_comp.glsl
@@ -14,7 +14,7 @@
  *  Half-resolution Color, signed CoC (out_coc.x), and max slight focus abs CoC (out_coc.y).
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_setup)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_stabilize_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_stabilize_comp.glsl
index ec9b8b6684f..4d7c9b68ece 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_stabilize_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_stabilize_comp.glsl
@@ -17,7 +17,7 @@
  * - Stabilized Color and CoC (half-resolution).
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_stabilize)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_dilate_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_dilate_comp.glsl
index 80925a987fe..30f2c7d884c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_dilate_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_dilate_comp.glsl
@@ -10,7 +10,7 @@
  * - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_dilate)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_comp.glsl
index cb8119778c6..ce83ca3cf91 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_comp.glsl
@@ -15,7 +15,7 @@
  * - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res.
  */
 
-#include "infos/eevee_depth_of_field_info.hh"
+#include "infos/eevee_depth_of_field_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_flatten)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_frag.glsl
index 68945e01951..113cb38d491 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_planar)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_vert.glsl
index 504baabcc57..f94e9ac5d0b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_planar)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_frag.glsl
index 7b4fb1aeb71..8bbe4d1cd76 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_vert.glsl
index e196a421316..966ed8bb5c6 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_frag.glsl
index 16abbd7bdbb..62ed703087d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_volume)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_vert.glsl
index 2f5816dc5a9..9414398274d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_volume)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_comp.glsl
index 5cb5b12e90a..e5282273a49 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_film_comp)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_copy_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_copy_frag.glsl
index 11db515fe7e..fee0a9d8960 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_copy_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_copy_frag.glsl
@@ -12,7 +12,7 @@
  * Code is duplicated here to ensure that the compiler will pass read/write resource checks.
  */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_film_copy_frag)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_cryptomatte_post_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_cryptomatte_post_comp.glsl
index d0158420475..83d07dfbe8f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_cryptomatte_post_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_cryptomatte_post_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_film_cryptomatte_post)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_frag.glsl
index 675ab4a3e9c..2f89bc715e0 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_film_frag)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_lib.glsl
index bec5ac3387a..581115e9bda 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_lib.glsl
@@ -8,7 +8,7 @@
  * Film accumulation utils functions.
  */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_film)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_film_pass_convert_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_film_pass_convert_comp.glsl
index 52a339ae510..ce415f2cc1b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_film_pass_convert_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_film_pass_convert_comp.glsl
@@ -6,7 +6,7 @@
  * output passes covert the entire display extent even when border rendering because that's what
  * the compositor expects, so areas outside of the border are zeroed. */
 
-#include "infos/eevee_film_info.hh"
+#include "infos/eevee_film_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_film_pass_convert_color)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_lib.glsl
index 8ba41cba06f..8128630fc87 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_lib.glsl
@@ -21,7 +21,7 @@
  */
 
 #include "gpu_shader_math_vector_reduce_lib.glsl"
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "gpu_shader_codegen_lib.glsl"
 #include "gpu_shader_math_vector_lib.glsl"
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_write_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_write_lib.glsl
index 5773eea4a78..76aa6ad0704 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_write_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_gbuffer_write_lib.glsl
@@ -20,7 +20,7 @@
  * without dealing with none-closures.
  */
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "eevee_gbuffer_lib.glsl"
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl
index 1f0c16e69ab..a2f4b897582 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
 VERTEX_SHADER_CREATE_INFO(eevee_geom_curves)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_mesh_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_mesh_vert.glsl
index c73c147794a..01360bfca05 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_geom_mesh_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_mesh_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
 VERTEX_SHADER_CREATE_INFO(eevee_geom_mesh)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_pointcloud_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_pointcloud_vert.glsl
index d839de4583e..1446b441638 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_geom_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
 VERTEX_SHADER_CREATE_INFO(eevee_geom_pointcloud)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl
index 3880b6bd18e..bffd8f6b165 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
 VERTEX_SHADER_CREATE_INFO(eevee_geom_volume)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl
index 0bb4e01604f..a9ab71bad4e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl
@@ -6,7 +6,7 @@
  * Custom full-screen triangle with placeholders varyings.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_geom_world)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_hiz_debug_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_hiz_debug_frag.glsl
index ea3641805a4..dc92ca2e0da 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_hiz_debug_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_hiz_debug_frag.glsl
@@ -7,7 +7,7 @@
  * Output red if above any max pixels, blue otherwise.
  */
 
-#include "infos/eevee_hiz_info.hh"
+#include "infos/eevee_hiz_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_hiz_debug)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_hiz_update_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_hiz_update_comp.glsl
index ef8fe891844..ab8fddfe66a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_hiz_update_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_hiz_update_comp.glsl
@@ -17,7 +17,7 @@
  * downsample to max level.
  */
 
-#include "infos/eevee_hiz_info.hh"
+#include "infos/eevee_hiz_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_hiz_update)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_denoise_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_denoise_comp.glsl
index fdb65436d65..099b92fe406 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_denoise_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_denoise_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_horizon_denoise)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_resolve_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_resolve_comp.glsl
index 156a3a0da20..a34be7b3b95 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_resolve_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_resolve_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_horizon_resolve)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_comp.glsl
index 0fd3f3d70c0..6f853769ff5 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_horizon_scan)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl
index 90ff3d82c99..a4f58901112 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl
@@ -15,7 +15,7 @@
  * defined.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_horizon_scan)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_setup_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_setup_comp.glsl
index 969820559a1..639e4aca09a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_setup_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_setup_comp.glsl
@@ -8,7 +8,7 @@
  * Dispatched as one thread for each trace resolution pixel.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_horizon_setup)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_debug_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_debug_frag.glsl
index 5e0611b8f2d..566c080a95b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_debug_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_debug_frag.glsl
@@ -8,7 +8,7 @@
  * pass is not conservative enough).
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_light_culling_debug)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_select_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_select_comp.glsl
index 0b0d0ea60ec..1fe4db3a19b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_select_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_select_comp.glsl
@@ -6,7 +6,7 @@
  * Select the visible items inside the active view and put them inside the sorting buffer.
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_select)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_sort_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_sort_comp.glsl
index 5329525beec..136653e61b6 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_sort_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_sort_comp.glsl
@@ -8,7 +8,7 @@
  * One thread processes one Light entity.
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_sort)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_tile_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_tile_comp.glsl
index acb607302c6..48880d5efe5 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_tile_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_tile_comp.glsl
@@ -8,7 +8,7 @@
  * Dispatch one thread per word.
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_tile)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_zbin_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_zbin_comp.glsl
index c54c15bdf8c..4d863de31f1 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_culling_zbin_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_culling_zbin_comp.glsl
@@ -8,7 +8,7 @@
  * For this reason, we only dispatch 1 thread group.
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_zbin)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_eval_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_eval_lib.glsl
index a8928115682..30c5fef383c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_eval_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_eval_lib.glsl
@@ -15,7 +15,7 @@
  * - utility_tx
  */
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_light_data)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_light_shadow_setup_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_light_shadow_setup_comp.glsl
index d853e013243..323f06246a2 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_light_shadow_setup_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_light_shadow_setup_comp.glsl
@@ -7,7 +7,7 @@
  * Dispatched one thread per light.
  */
 
-#include "infos/eevee_light_culling_info.hh"
+#include "infos/eevee_light_culling_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_light_shadow_setup)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_lib.glsl
index 2e68f49211b..d56d10a27e2 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 /* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface.
  * Currently in conflict with eevee_lightprobe_volume_load. */
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_convolve_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_convolve_comp.glsl
index 6a0bf97626d..9f7f0d13034 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_convolve_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_convolve_comp.glsl
@@ -4,7 +4,7 @@
 
 /* Shader to convert cube-map to octahedral projection. */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_convolve)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl
index 6b70da3510f..56676af7f8d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl
@@ -5,7 +5,7 @@
 /* Sum all spherical harmonic coefficients extracting during remapping to octahedral map.
  * Dispatch only one thread-group that sums. */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_irradiance)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_lib.glsl
index c19799eec93..0f2def70822 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 /* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface.
  * Currently in conflict with eevee_lightprobe_volume_load. */
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_mapping_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_mapping_lib.glsl
index 91bfd907b21..30d5e94414f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_mapping_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_mapping_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "eevee_octahedron_lib.glsl"
 #include "gpu_shader_math_base_lib.glsl"
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_remap_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_remap_comp.glsl
index e16a322b8dc..5af5844db61 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_remap_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_remap_comp.glsl
@@ -4,7 +4,7 @@
 
 /* Shader to convert cube-map to octahedral projection. */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_remap)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_select_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_select_comp.glsl
index 66e9f42ef1e..7c81f1119ec 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_select_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_select_comp.glsl
@@ -7,7 +7,7 @@
  * irradiance cache from each spherical probe location except for the world probe.
  */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 #ifdef GLSL_CPP_STUBS
 #  define SPHERE_PROBE_SELECT
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl
index 25715159d21..a15a9ddaceb 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl
@@ -5,7 +5,7 @@
 /* Sum all Suns extracting during remapping to octahedral map.
  * Dispatch only one thread-group that sums. */
 
-#include "infos/eevee_lightprobe_sphere_info.hh"
+#include "infos/eevee_lightprobe_sphere_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_sunlight)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_bounds_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_bounds_comp.glsl
index 83bf8bbb025..79256f41f8c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_bounds_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_bounds_comp.glsl
@@ -9,7 +9,7 @@
  * - capture_info_buf
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_bounds)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_load_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_load_comp.glsl
index ac349e64d93..07f3166aa9f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_load_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_load_comp.glsl
@@ -9,7 +9,7 @@
  * Each thread group will load a brick worth of data and add the needed padding texels.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 #ifdef GLSL_CPP_STUBS
 #  define IRRADIANCE_GRID_UPLOAD
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_offset_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_offset_comp.glsl
index 31459275ee9..a458c9960b0 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_offset_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_offset_comp.glsl
@@ -10,7 +10,7 @@
  * Dispatched as 1 thread per irradiance probe sample.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_offset)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_ray_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_ray_comp.glsl
index 39b83e84d56..d42e0f6ac5a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_ray_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_ray_comp.glsl
@@ -10,7 +10,7 @@
  * Dispatched as 1 thread per irradiance probe sample.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_ray)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_world_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_world_comp.glsl
index 2e0c4d9d854..a62abe395fc 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_world_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_world_comp.glsl
@@ -8,7 +8,7 @@
  * The whole thread group will load the same data and write a brick worth of data.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_world)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_frag.glsl
index a182cc8bdaf..32f13e2cda6 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lookdev_info.hh"
+#include "infos/eevee_lookdev_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_lookdev_display)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_vert.glsl
index 2daa23c89bc..e6ed33231d5 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_lookdev_info.hh"
+#include "infos/eevee_lookdev_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_lookdev_display)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ltc_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ltc_lib.glsl
index e13b0473ea1..d24cb900e2c 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ltc_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ltc_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 /**
  * Adapted from :
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_lut_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_lut_comp.glsl
index 80f9af64cf5..9de20ac7dc9 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_lut_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_lut_comp.glsl
@@ -7,7 +7,7 @@
  * the blender executable. This is only used for reference or to update them.
  */
 
-#include "infos/eevee_lut_info.hh"
+#include "infos/eevee_lut_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_lut)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_dilate_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_dilate_comp.glsl
index a44546067f0..5111a65cea3 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_dilate_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_dilate_comp.glsl
@@ -7,7 +7,7 @@
  * Outputs the largest intersecting motion vector in the neighborhood.
  */
 
-#include "infos/eevee_motion_blur_info.hh"
+#include "infos/eevee_motion_blur_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_dilate)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_flatten_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_flatten_comp.glsl
index 4d1cb0bc7d2..7911a924259 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_flatten_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_flatten_comp.glsl
@@ -14,7 +14,7 @@
  * Adapted from G3D Innovation Engine implementation.
  */
 
-#include "infos/eevee_motion_blur_info.hh"
+#include "infos/eevee_motion_blur_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_flatten_rgba)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_gather_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_gather_comp.glsl
index 1efe932cb86..3a1d82f8d1e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_gather_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_gather_comp.glsl
@@ -13,7 +13,7 @@
  * by Jorge Jimenez
  */
 
-#include "infos/eevee_motion_blur_info.hh"
+#include "infos/eevee_motion_blur_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_gather)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_lib.glsl
index 0ef5108bce3..015d80c8b2e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_motion_blur_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Tile indirection packing
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl
index c521a5f71bf..8aa7bba12a4 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
 SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_occupancy_convert_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_occupancy_convert_frag.glsl
index 79f4ded19d5..6c8a592ce9f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_occupancy_convert_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_occupancy_convert_frag.glsl
@@ -6,7 +6,7 @@
  * Convert hit list to occupancy bit-field for the material pass.
  */
 
-#include "infos/eevee_volume_info.hh"
+#include "infos/eevee_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_volume_occupancy_convert)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_bilateral_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_bilateral_comp.glsl
index f74f1a8334e..ed7d1b73e4e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_bilateral_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_bilateral_comp.glsl
@@ -15,7 +15,7 @@
  * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_bilateral)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_spatial_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_spatial_comp.glsl
index 92102410ad8..8107d35c0fe 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_spatial_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_spatial_comp.glsl
@@ -15,7 +15,7 @@
  * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_spatial)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_temporal_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_temporal_comp.glsl
index 7e377afbbfe..ad7d41fb438 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_temporal_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_temporal_comp.glsl
@@ -15,7 +15,7 @@
  * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_temporal)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_generate_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_generate_comp.glsl
index 20b79d22eac..9ec4233d0fd 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_generate_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_generate_comp.glsl
@@ -7,7 +7,7 @@
  * by the next pass to trace the rays.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_generate)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_classify_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_classify_comp.glsl
index 23fac98d1e5..9419f5a314a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_classify_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_classify_comp.glsl
@@ -7,7 +7,7 @@
  * This mask is then processed by the compaction phase.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_classify)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_compact_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_compact_comp.glsl
index 7c3b27c09fd..b1620a2ab9a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_compact_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_tile_compact_comp.glsl
@@ -8,7 +8,7 @@
  * Dispatched as one thread for each trace resolution tile.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_compact)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_fallback_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_fallback_comp.glsl
index 3365cb1a321..34a5a84a277 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_fallback_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_fallback_comp.glsl
@@ -6,7 +6,7 @@
  * Does not use any tracing method. Only rely on local light probes to get the incoming radiance.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_fallback)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl
index ef752c4e639..43c2c619813 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl
@@ -9,7 +9,7 @@
  * are then tagged to avoid re-evaluation by screen trace.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_planar)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl
index 680dbaa9b79..229accc9d6b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl
@@ -6,7 +6,7 @@
  * Use screen space tracing against depth buffer to find intersection with the scene.
  */
 
-#include "infos/eevee_tracing_info.hh"
+#include "infos/eevee_tracing_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_screen)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_renderpass_clear_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_renderpass_clear_frag.glsl
index 9b084d7acaa..48a928f0a1d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_renderpass_clear_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_renderpass_clear_frag.glsl
@@ -6,7 +6,7 @@
  * Clear render passes and background.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_renderpass_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_renderpass_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_renderpass_lib.glsl
index 4e87b2c2793..4b733aa0a70 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_renderpass_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_renderpass_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_render_pass_out)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_sampling_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_sampling_lib.glsl
index d38c0010a92..901fe545bf7 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_sampling_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_sampling_lib.glsl
@@ -9,7 +9,7 @@
  * Also contains some sample mapping functions.
  */
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_sampling_data)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_clipmap_clear_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_clipmap_clear_comp.glsl
index 3b66e2f8779..26260795913 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_clipmap_clear_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_clipmap_clear_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_clipmap_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_debug_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_debug_frag.glsl
index 4d8afa26d3b..0d5003a9187 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_debug_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_debug_frag.glsl
@@ -7,7 +7,7 @@
  * See eShadowDebug for more information.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_debug)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_allocate_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_allocate_comp.glsl
index 17d268b20bb..e38de036904 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_allocate_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_allocate_comp.glsl
@@ -9,7 +9,7 @@
  * Note that allocation can fail, in this case the tile is left with no page.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_allocate)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_clear_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_clear_comp.glsl
index 4add3df9375..fa53096eba8 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_clear_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_clear_comp.glsl
@@ -8,7 +8,7 @@
  * Equivalent to a frame-buffer depth clear but only for pages pushed to the clear_page_buf.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_defrag_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_defrag_comp.glsl
index e7f9cdef574..1c7163510a2 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_defrag_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_defrag_comp.glsl
@@ -18,7 +18,7 @@
  *     `[----xxxxxx------]`
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_defrag)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
index 15e0ae0b60d..e2c21d71715 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
@@ -10,7 +10,7 @@
  * Note that we also count the number of new page allocations needed.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_free)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_mask_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_mask_comp.glsl
index 805431f4822..7ff23a47eb4 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_mask_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_mask_comp.glsl
@@ -9,7 +9,7 @@
  * views per shadow map).
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_mask)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_ops_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_ops_lib.glsl
index e43f477ec44..99143b34567 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_ops_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_ops_lib.glsl
@@ -27,7 +27,7 @@
  * IMPORTANT: Do not forget to manually store the tile data after doing operations on them.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(eevee_shadow_page_free)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_frag.glsl
index 4c65777490d..5d897f24d76 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_frag.glsl
@@ -35,7 +35,7 @@
  * belong to shadow pages not being updated in this pass are discarded.
  **/
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_vert.glsl
index 76f720d4ea8..b303e196ed4 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_vert.glsl
@@ -8,7 +8,7 @@
  * See fragment shader for more infos.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl
index ad8043a1584..00881fe5655 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl
@@ -11,7 +11,7 @@
  * tag the appropriate tiles.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_update)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_comp.glsl
index 50b116c3a3e..d2b3a3bf16e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_comp.glsl
@@ -10,7 +10,7 @@
  * needed.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_opaque)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl
index 5700fd52291..d3ef618a633 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl
@@ -10,7 +10,7 @@
  * tiles.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_lib.glsl
index e8a85b38a60..08a66bc4d57 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_lib.glsl
@@ -11,7 +11,7 @@
  * This contains the common logic used for tagging shadows for opaque and transparent receivers.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(eevee_shadow_tag_usage_surfels)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_surfels_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_surfels_comp.glsl
index fb2533e3fb9..cc3d0208fe8 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_surfels_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_surfels_comp.glsl
@@ -10,7 +10,7 @@
  * needed.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_surfels)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl
index 7a7b2031758..a978672ce08 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl
@@ -9,7 +9,7 @@
  * This renders the bounding boxes for transparent objects in order to tag the correct shadows.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_volume_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_volume_comp.glsl
index b654c00274c..424ef5df041 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_volume_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_volume_comp.glsl
@@ -9,7 +9,7 @@
  * This pass scans all volume froxels and tags tiles needed for shadowing.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_volume)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_amend_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_amend_comp.glsl
index 4858b0b8e56..cd7fe31dd80 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_amend_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_amend_comp.glsl
@@ -15,7 +15,7 @@
  * Currently this shader is dispatched with one thread-group for all directional light.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_amend)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_bounds_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_bounds_comp.glsl
index 5b034e93840..58663b93687 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_bounds_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_bounds_comp.glsl
@@ -10,7 +10,7 @@
  * their range changes.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_bounds)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_finalize_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_finalize_comp.glsl
index ef2628e2b1f..500e484e65f 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_finalize_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_finalize_comp.glsl
@@ -10,7 +10,7 @@
  * to use a sampler instead of a SSBO bind.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_finalize)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_init_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_init_comp.glsl
index 29024791e79..5fc3ab9de7e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_init_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_init_comp.glsl
@@ -10,7 +10,7 @@
  * Dispatched with one local thread per LOD0 tile and one work-group per tile-map.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_init)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl
index 6f320d35aae..5f07b6b4906 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "draw_shape_lib.glsl"
 #include "gpu_shader_math_constants_lib.glsl"
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_rendermap_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_rendermap_comp.glsl
index b95cca707c9..129d2b6cd11 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_rendermap_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_rendermap_comp.glsl
@@ -8,7 +8,7 @@
  * For each shadow view, copy page atlas location to the indirection table before render.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_rendermap)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tracing_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tracing_lib.glsl
index 9eb31048f87..6160ac6a651 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tracing_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tracing_lib.glsl
@@ -8,7 +8,7 @@
  * Evaluate shadowing using shadow map ray-tracing.
  */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
 SHADER_LIBRARY_CREATE_INFO(eevee_shadow_data)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_visibility_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_visibility_comp.glsl
index 8bc82dbd0df..7263e459b94 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_visibility_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_visibility_comp.glsl
@@ -8,7 +8,7 @@
  */
 /* TODO(fclem): Could reject bounding boxes that are covering only invalid tiles. */
 
-#include "infos/eevee_shadow_info.hh"
+#include "infos/eevee_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_shadow_view_visibility)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_convolve_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_convolve_comp.glsl
index b4efd818208..dcd3e381b4b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_convolve_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_convolve_comp.glsl
@@ -13,7 +13,7 @@
  * we precompute a weight profile texture to be able to support per pixel AND per channel radius.
  */
 
-#include "infos/eevee_subsurface_info.hh"
+#include "infos/eevee_subsurface_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_convolve)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_lib.glsl
index a2101f5fa17..12821985313 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_lib.glsl
@@ -11,7 +11,7 @@
  * - utility_tx
  */
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "eevee_utility_tx_lib.glsl"
 #include "gpu_shader_utildefines_lib.glsl"
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_setup_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_setup_comp.glsl
index 0705a5a697c..fd74f905fcc 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_subsurface_setup_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_subsurface_setup_comp.glsl
@@ -7,7 +7,7 @@
  * processing.
  */
 
-#include "infos/eevee_subsurface_info.hh"
+#include "infos/eevee_subsurface_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_setup)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl
index 297924757e9..48218ffb414 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl
@@ -9,7 +9,7 @@
  * into other surface shaders.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
 FRAGMENT_SHADER_CREATE_INFO(eevee_surf_capture)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl
index bf8d5de8119..e127cc14066 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl
@@ -9,7 +9,7 @@
  * Some render-pass are written during this pass.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree)
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl
index 7d7f8b529b3..dd2a65aaa61 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl
@@ -6,7 +6,7 @@
  * Depth shader that can stochastically discard transparent pixel.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_clip_plane)
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl
index e645f57ad34..20b34b8a68e 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl
@@ -8,7 +8,7 @@
  * This is used by alpha blended materials and materials using Shader to RGB nodes.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
 FRAGMENT_SHADER_CREATE_INFO(eevee_surf_forward)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl
index 7a1004f9bd5..1fe0c1b9453 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl
@@ -9,7 +9,7 @@
  * Some render-pass are written during this pass.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree)
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_lib.glsl
index a53dad01402..4e7e4a428ce 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_geom_mesh)
 SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_occupancy_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_occupancy_frag.glsl
index 852cbf95824..30cbe0ab5eb 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_occupancy_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_occupancy_frag.glsl
@@ -30,7 +30,7 @@
  *
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
 FRAGMENT_SHADER_CREATE_INFO(eevee_surf_occupancy)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_shadow_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_shadow_frag.glsl
index d1f79131180..5ebd58d3006 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_shadow_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_shadow_frag.glsl
@@ -11,7 +11,7 @@
  * the destination texel.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
 FRAGMENT_SHADER_CREATE_INFO(eevee_surf_shadow_atomic)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_volume_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_volume_frag.glsl
index b4b10b941d9..e4497923513 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_volume_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_volume_frag.glsl
@@ -7,7 +7,7 @@
 
 /* Store volumetric properties into the froxel textures. */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 #ifdef GLSL_CPP_STUBS
 #  define MAT_VOLUME
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_world_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_world_frag.glsl
index d10635bd20b..cc236e30ab9 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surf_world_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_world_frag.glsl
@@ -8,7 +8,7 @@
  * Outputs shading parameter per pixel using a set of randomized BSDFs.
  */
 
-#include "infos/eevee_material_info.hh"
+#include "infos/eevee_material_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_geom_world)
 FRAGMENT_SHADER_CREATE_INFO(eevee_surf_world)
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surfel_cluster_build_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surfel_cluster_build_comp.glsl
index be2f510ee2e..b00593ee025 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surfel_cluster_build_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surfel_cluster_build_comp.glsl
@@ -10,7 +10,7 @@
  * Dispatch 1 thread per surfel.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_surfel_cluster_build)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surfel_light_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surfel_light_comp.glsl
index cf2d5b0f6db..35208e1c179 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surfel_light_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surfel_light_comp.glsl
@@ -6,7 +6,7 @@
  * Apply lights contribution to scene surfel representation.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 #ifdef GLSL_CPP_STUBS
 #  define LIGHT_ITER_FORCE_NO_CULLING
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_build_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_build_comp.glsl
index 7c42dd70783..c7e920a97c8 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_build_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_build_comp.glsl
@@ -13,7 +13,7 @@
  * Dispatch 1 thread per surfel.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_build)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_sort_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_sort_comp.glsl
index d32be554bdc..93aeae97144 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_sort_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surfel_list_sort_comp.glsl
@@ -12,7 +12,7 @@
  * Dispatched as 1 thread per list.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_sort)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surfel_ray_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surfel_ray_comp.glsl
index c2f64b7b72c..bb898cf06be 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_surfel_ray_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_surfel_ray_comp.glsl
@@ -11,7 +11,7 @@
  * Dispatched as 1 thread per surfel.
  */
 
-#include "infos/eevee_lightprobe_volume_info.hh"
+#include "infos/eevee_lightprobe_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_surfel_ray)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_utility_tx_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_utility_tx_lib.glsl
index 5cc754beb27..6153ee41781 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_utility_tx_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_utility_tx_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 #include "gpu_shader_compat.hh"
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_velocity_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_velocity_lib.glsl
index 8afaa5c4ea7..542d0d9df21 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_velocity_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_velocity_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_velocity_info.hh"
+#include "infos/eevee_velocity_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_velocity_camera)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_vertex_copy_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_vertex_copy_comp.glsl
index 4361b639616..669d45d5428 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_vertex_copy_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_vertex_copy_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/eevee_velocity_info.hh"
+#include "infos/eevee_velocity_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_vertex_copy)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_volume_integration_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_volume_integration_comp.glsl
index ee16ff54a70..07a6b6b2f4a 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_volume_integration_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_volume_integration_comp.glsl
@@ -8,7 +8,7 @@
 /* Step 3 : Integrate for each froxel the final amount of light
  * scattered back to the viewer and the amount of transmittance. */
 
-#include "infos/eevee_volume_info.hh"
+#include "infos/eevee_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_volume_integration)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_volume_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_volume_lib.glsl
index b06abe772aa..3e14bbd05a2 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_volume_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_volume_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/eevee_common_info.hh"
+#include "infos/eevee_common_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_volume_resolve_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_volume_resolve_frag.glsl
index 690afc0be02..bc350385562 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_volume_resolve_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_volume_resolve_frag.glsl
@@ -7,7 +7,7 @@
 
 /* Step 4 : Apply final integration on top of the scene color. */
 
-#include "infos/eevee_volume_info.hh"
+#include "infos/eevee_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(eevee_volume_resolve)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_volume_scatter_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_volume_scatter_comp.glsl
index 9909ccbe291..8a2a395077d 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_volume_scatter_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_volume_scatter_comp.glsl
@@ -8,7 +8,7 @@
 /* Step 2 : Evaluate all light scattering for each froxels.
  * Also do the temporal reprojection to fight aliasing artifacts. */
 
-#include "infos/eevee_volume_info.hh"
+#include "infos/eevee_volume_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights)
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
similarity index 93%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
index 99ce0e34e5d..bff091071fe 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
@@ -6,8 +6,8 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 
 #  define HORIZON_OCCLUSION
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_common_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_common_info.hh
index c67e83fd39c..4390761f9ca 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_common_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_common_info.hh
@@ -6,8 +6,8 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 #  include "eevee_light_shared.hh"
 #  include "eevee_lightprobe_shared.hh"
 #  include "eevee_sampling_shared.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_common_infos.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_common_infos.hh
new file mode 100644
index 00000000000..4390761f9ca
--- /dev/null
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_common_infos.hh
@@ -0,0 +1,173 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifdef GPU_SHADER
+#  pragma once
+#  include "gpu_shader_compat.hh"
+
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_light_shared.hh"
+#  include "eevee_lightprobe_shared.hh"
+#  include "eevee_sampling_shared.hh"
+#  include "eevee_shadow_shared.hh"
+#  include "eevee_uniform_shared.hh"
+
+#  define EEVEE_SAMPLING_DATA
+#  define MAT_CLIP_PLANE
+#  define PLANAR_PROBES
+#  define MAT_RENDER_PASS_SUPPORT
+#  define SHADOW_READ_ATOMIC
+
+/* Stub for C++ compilation. */
+struct NodeTree {
+  float crypto_hash;
+  float _pad0;
+  float _pad1;
+  float _pad2;
+};
+#endif
+
+#include "eevee_defines.hh"
+#include "gpu_shader_create_info.hh"
+
+/* -------------------------------------------------------------------- */
+/** \name Common
+ * \{ */
+
+/* Stub for C++ compilation. */
+/* TODO(fclem): Use it for actual interface. */
+GPU_SHADER_CREATE_INFO(eevee_node_tree)
+UNIFORM_BUF(0 /*GPU_NODE_TREE_UBO_SLOT*/, NodeTree, node_tree)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_global_ubo)
+TYPEDEF_SOURCE("eevee_uniform_shared.hh")
+UNIFORM_BUF(UNIFORM_BUF_SLOT, UniformData, uniform_buf)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_hiz_data)
+SAMPLER(HIZ_TEX_SLOT, sampler2D, hiz_tx)
+ADDITIONAL_INFO(eevee_global_ubo)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_sampling_data)
+DEFINE("EEVEE_SAMPLING_DATA")
+TYPEDEF_SOURCE("eevee_defines.hh")
+TYPEDEF_SOURCE("eevee_sampling_shared.hh")
+STORAGE_BUF(SAMPLING_BUF_SLOT, read, SamplingData, sampling_buf)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_utility_texture)
+SAMPLER(RBUFS_UTILITY_TEX_SLOT, sampler2DArray, utility_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_NAMED_INTERFACE_INFO(eevee_clip_plane_iface, clip_interp)
+SMOOTH(float, clip_distance)
+GPU_SHADER_NAMED_INTERFACE_END(clip_interp)
+
+GPU_SHADER_CREATE_INFO(eevee_clip_plane)
+VERTEX_OUT(eevee_clip_plane_iface)
+TYPEDEF_SOURCE("eevee_uniform_shared.hh")
+UNIFORM_BUF(CLIP_PLANE_BUF, ClipPlaneData, clip_plane)
+DEFINE("MAT_CLIP_PLANE")
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_lightprobe_sphere_data)
+DEFINE("SPHERE_PROBE")
+TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
+UNIFORM_BUF(SPHERE_PROBE_BUF_SLOT, SphereProbeData, lightprobe_sphere_buf[SPHERE_PROBE_MAX])
+SAMPLER(SPHERE_PROBE_TEX_SLOT, sampler2DArray, lightprobe_spheres_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_volume_probe_data)
+TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
+UNIFORM_BUF(IRRADIANCE_GRID_BUF_SLOT, VolumeProbeData, grids_infos_buf[IRRADIANCE_GRID_MAX])
+/* NOTE: Use uint instead of IrradianceBrickPacked because Metal needs to know the exact type.
+ */
+STORAGE_BUF(IRRADIANCE_BRICK_BUF_SLOT, read, uint, bricks_infos_buf[])
+SAMPLER(VOLUME_PROBE_TEX_SLOT, sampler3D, irradiance_atlas_tx)
+DEFINE("IRRADIANCE_GRID_SAMPLING")
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_lightprobe_planar_data)
+DEFINE("SPHERE_PROBE")
+TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
+UNIFORM_BUF(PLANAR_PROBE_BUF_SLOT, PlanarProbeData, probe_planar_buf[PLANAR_PROBE_MAX])
+SAMPLER(PLANAR_PROBE_RADIANCE_TEX_SLOT, sampler2DArray, planar_radiance_tx)
+SAMPLER(PLANAR_PROBE_DEPTH_TEX_SLOT, sampler2DArrayDepth, planar_depth_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_lightprobe_data)
+ADDITIONAL_INFO(eevee_lightprobe_sphere_data)
+ADDITIONAL_INFO(eevee_volume_probe_data)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_light_data)
+TYPEDEF_SOURCE("eevee_light_shared.hh")
+STORAGE_BUF(LIGHT_CULL_BUF_SLOT, read, LightCullingData, light_cull_buf)
+STORAGE_BUF(LIGHT_BUF_SLOT, read, LightData, light_buf[])
+STORAGE_BUF(LIGHT_ZBIN_BUF_SLOT, read, uint, light_zbin_buf[])
+STORAGE_BUF(LIGHT_TILE_BUF_SLOT, read, uint, light_tile_buf[])
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_shadow_data)
+TYPEDEF_SOURCE("eevee_shadow_shared.hh")
+/* SHADOW_READ_ATOMIC macro indicating shadow functions should use `usampler2DArrayAtomic` as
+ * the atlas type. */
+DEFINE("SHADOW_READ_ATOMIC")
+BUILTINS(BuiltinBits::TEXTURE_ATOMIC)
+SAMPLER(SHADOW_ATLAS_TEX_SLOT, usampler2DArrayAtomic, shadow_atlas_tx)
+SAMPLER(SHADOW_TILEMAPS_TEX_SLOT, usampler2D, shadow_tilemaps_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_shadow_data_non_atomic)
+TYPEDEF_SOURCE("eevee_shadow_shared.hh")
+SAMPLER(SHADOW_ATLAS_TEX_SLOT, usampler2DArray, shadow_atlas_tx)
+SAMPLER(SHADOW_TILEMAPS_TEX_SLOT, usampler2D, shadow_tilemaps_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_surfel_common)
+TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
+STORAGE_BUF(SURFEL_BUF_SLOT, read_write, Surfel, surfel_buf[])
+STORAGE_BUF(CAPTURE_BUF_SLOT, read, CaptureInfoData, capture_info_buf)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_volume_properties_data)
+ADDITIONAL_INFO(eevee_global_ubo)
+IMAGE(VOLUME_PROP_SCATTERING_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_scattering_img)
+IMAGE(VOLUME_PROP_EXTINCTION_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_extinction_img)
+IMAGE(VOLUME_PROP_EMISSION_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_emission_img)
+IMAGE(VOLUME_PROP_PHASE_IMG_SLOT, SFLOAT_16, read, image3D, in_phase_img)
+IMAGE(VOLUME_PROP_PHASE_WEIGHT_IMG_SLOT, SFLOAT_16, read, image3D, in_phase_weight_img)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_gbuffer_data)
+DEFINE("GBUFFER_LOAD")
+SAMPLER(12, usampler2DArray, gbuf_header_tx)
+SAMPLER(13, sampler2DArray, gbuf_closure_tx)
+SAMPLER(14, sampler2DArray, gbuf_normal_tx)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_render_pass_out)
+DEFINE("MAT_RENDER_PASS_SUPPORT")
+ADDITIONAL_INFO(eevee_global_ubo)
+IMAGE_FREQ(RBUFS_COLOR_SLOT, SFLOAT_16_16_16_16, write, image2DArray, rp_color_img, PASS)
+IMAGE_FREQ(RBUFS_VALUE_SLOT, SFLOAT_16, write, image2DArray, rp_value_img, PASS)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_cryptomatte_out)
+STORAGE_BUF(CRYPTOMATTE_BUF_SLOT, read, float2, cryptomatte_object_buf[])
+IMAGE_FREQ(RBUFS_CRYPTOMATTE_SLOT, SFLOAT_32_32_32_32, write, image2D, rp_cryptomatte_img, PASS)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(eevee_tests_data)
+TYPEDEF_SOURCE("eevee_defines.hh")
+DEFINE("MAT_REFLECTION")
+DEFINE("MAT_REFRACTION")
+DEFINE("MAT_SUBSURFACE")
+DEFINE("MAT_TRANSLUCENT")
+GPU_SHADER_CREATE_END()
+
+/** \} */
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_infos.hh
similarity index 98%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_infos.hh
index 0d96b5b92e4..eac26f47fc5 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_infos.hh
@@ -6,10 +6,10 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_debug_shared.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
 #include "eevee_defines.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
similarity index 99%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
index 907180de16c..c9afaad97d0 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
@@ -8,10 +8,10 @@
 
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_depth_of_field_shared.hh"
-#  include "eevee_velocity_info.hh"
+#  include "eevee_velocity_infos.hh"
 
 #  define DOF_BOKEH_TEXTURE true
 #  define DILATE_MODE_MIN_MAX true
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_film_infos.hh
similarity index 97%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_film_infos.hh
index 564bb90fe25..17d7d919d66 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_film_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_film_shared.hh"
-#  include "eevee_velocity_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "eevee_velocity_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
 #include "eevee_defines.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_infos.hh
similarity index 93%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_infos.hh
index 7d44b3b22e1..85ce55574ab 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_infos.hh
@@ -6,9 +6,9 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
 #include "eevee_defines.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_infos.hh
similarity index 95%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_infos.hh
index 44903296cea..bf2b922d581 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_light_shared.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define SPHERE_PROBE
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
similarity index 96%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
index d9d5615739e..05f9da66d94 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_lightprobe_shared.hh"
-#  include "eevee_lightprobe_volume_info.hh"
+#  include "eevee_lightprobe_volume_infos.hh"
 
 #  define SPHERE_PROBE
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
similarity index 98%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
index 4e72e21502d..f3e463ca2ab 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
@@ -6,9 +6,9 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_debug_shared.hh"
 #  include "eevee_lightprobe_shared.hh"
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_infos.hh
similarity index 96%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_infos.hh
index f5f935482a7..51c11e517ce 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
+#  include "draw_view_infos.hh"
 
 #  define SPHERE_PROBE
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_lut_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_lut_infos.hh
similarity index 95%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_lut_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_lut_infos.hh
index e406cdf38a9..e05affbf271 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_lut_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_lut_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "eevee_common_info.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_light_shared.hh"
 #  include "eevee_precompute_shared.hh"
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_material_infos.hh
similarity index 98%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_material_infos.hh
index 09ce6e58452..5e1585ce8da 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_material_infos.hh
@@ -8,12 +8,12 @@
 
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
-#  include "eevee_common_info.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_shadow_shared.hh"
-#  include "eevee_volume_info.hh"
+#  include "eevee_volume_infos.hh"
 
 #  define CURVES_SHADER
 #  define DRW_HAIR_INFO
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
similarity index 95%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
index bcdf24b3dff..3ef73ead3e1 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
@@ -6,10 +6,10 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_motion_blur_shared.hh"
-#  include "eevee_velocity_info.hh"
+#  include "eevee_velocity_infos.hh"
 #endif
 
 #include "eevee_defines.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_infos.hh
similarity index 98%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_infos.hh
index 22b6c7ecfb6..4806be7885d 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_infos.hh
@@ -6,12 +6,12 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_debug_shared.hh"
 #  include "eevee_shadow_shared.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define SPHERE_PROBE
 #endif
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_infos.hh
similarity index 97%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_infos.hh
index 31592d9a06e..6ee45f7b03a 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "eevee_common_info.hh"
+#  include "eevee_common_infos.hh"
 #endif
 
 #include "eevee_defines.hh"
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_infos.hh
similarity index 99%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_infos.hh
index ebdd317e686..24c7aedc3de 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_infos.hh
@@ -6,8 +6,8 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_raytrace_shared.hh"
 
 #  define SPHERE_PROBE
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_infos.hh
similarity index 96%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_infos.hh
index 7d1d5869e74..8fad74f9d74 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_infos.hh
@@ -6,8 +6,8 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 #  include "eevee_camera_shared.hh"
 #  include "eevee_velocity_shared.hh"
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_volume_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_volume_infos.hh
similarity index 95%
rename from source/blender/draw/engines/eevee/shaders/infos/eevee_volume_info.hh
rename to source/blender/draw/engines/eevee/shaders/infos/eevee_volume_infos.hh
index 2ebaadc026b..44a5c1e1b70 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_volume_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_volume_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "eevee_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "eevee_common_infos.hh"
 #  include "eevee_volume_shared.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define SPHERE_PROBE
 #endif
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_accumulation_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_accumulation_frag.glsl
index 4452b84a075..f8cd42efc01 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_accumulation_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_accumulation_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_accumulation)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_frag.glsl
index 07323ad8778..8aa3e46a40d 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_vert.glsl
index ee061591e88..2b99a550874 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_frag.glsl
index 5a609eaafc4..962ddc83527 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_depth_merge)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
index 4623ea87859..839bd7e6fc3 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpencil_depth_merge)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
index 333aa740927..e144dac7829 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_geometry)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
index f1df5da6ec6..92172d8a33d 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_layer_blend)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_mask_invert_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_mask_invert_frag.glsl
index 33a12eadeda..1b4f0eaf7a3 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_mask_invert_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_mask_invert_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_mask_invert)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
index 99ed62ea4c3..9070bd3d497 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_info.hh"
+#include "infos/gpencil_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpencil_geometry)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl
index 174c9206d8a..d1092b384e4 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpencil_vfx_info.hh"
+#include "infos/gpencil_vfx_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpencil_fx_composite)
 
diff --git a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_infos.hh
similarity index 98%
rename from source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh
rename to source/blender/draw/engines/gpencil/shaders/infos/gpencil_infos.hh
index 25f5ff9730d..ca8f3310204 100644
--- a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh
+++ b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_infos.hh
@@ -11,9 +11,9 @@
 
 #  include "gpencil_shader_shared.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define SMAA_GLSL_3
 #  define SMAA_STAGE 1
diff --git a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_info.hh b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
similarity index 97%
rename from source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_info.hh
rename to source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
index a2e982b4d3f..7f9bc29be5e 100644
--- a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_info.hh
+++ b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
@@ -9,8 +9,8 @@
 
 #  include "gpencil_shader_shared.hh"
 
-#  include "draw_view_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define COMPOSITE
 #endif
diff --git a/source/blender/draw/engines/image/shaders/infos/engine_image_info.hh b/source/blender/draw/engines/image/shaders/infos/engine_image_infos.hh
similarity index 100%
rename from source/blender/draw/engines/image/shaders/infos/engine_image_info.hh
rename to source/blender/draw/engines/image/shaders/infos/engine_image_infos.hh
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
similarity index 92%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
index cdc5f05f556..6c870c79d40 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
@@ -6,12 +6,12 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  include "overlay_shader_shared.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_CREATE_INFO(overlay_antialiasing)
 DO_STATIC_COMPILATION()
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_infos.hh
similarity index 97%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_armature_infos.hh
index 5ee23a14b89..adbd3c1cb23 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_armature_infos.hh
@@ -6,16 +6,16 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
-#  include "gpu_index_load_info.hh"
+#  include "gpu_index_load_infos.hh"
 
-#  include "overlay_common_info.hh"
+#  include "overlay_common_infos.hh"
 #  include "overlay_shader_shared.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_CREATE_INFO(overlay_frag_output)
 FRAGMENT_OUT(0, float4, frag_color)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_background_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_background_infos.hh
similarity index 89%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_background_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_background_infos.hh
index 340b0d8e4f6..427f52e30f6 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_background_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_background_infos.hh
@@ -6,10 +6,10 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
-#  include "overlay_common_info.hh"
+#  include "overlay_common_infos.hh"
 #  include "overlay_shader_shared.hh"
 #endif
 
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_common_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_common_infos.hh
similarity index 100%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_common_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_common_infos.hh
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
similarity index 99%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
index 907c9fd5e7e..770c2f3cbed 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
@@ -6,10 +6,10 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
-#  include "gpu_index_load_info.hh"
+#  include "gpu_index_load_infos.hh"
 
 #  include "overlay_shader_shared.hh"
 
@@ -20,7 +20,7 @@
 #  define DRW_POINTCLOUD_INFO
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_INTERFACE_INFO(overlay_edit_flat_wire_iface)
 NO_PERSPECTIVE(float2, edge_pos)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_infos.hh
similarity index 98%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_extra_infos.hh
index 4fba9b4cf36..833e9bee31f 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_infos.hh
@@ -6,15 +6,15 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
-#  include "gpu_index_load_info.hh"
+#  include "gpu_index_load_infos.hh"
 
 #  include "overlay_shader_shared.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Extra shapes
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_facing_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_facing_infos.hh
similarity index 82%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_facing_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_facing_infos.hh
index 3025fa414e5..1eed430399b 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_facing_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_facing_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_CREATE_INFO(overlay_facing_base)
 VERTEX_IN(0, float3, pos)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_grid_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_grid_infos.hh
similarity index 96%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_grid_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_grid_infos.hh
index 79fce98a80b..b519cc07088 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_grid_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_grid_infos.hh
@@ -6,12 +6,12 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_view_info.hh"
+#  include "draw_view_infos.hh"
 
 #  include "overlay_shader_shared.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 /* We use the normalized local position to avoid precision loss during interpolation. */
 GPU_SHADER_INTERFACE_INFO(overlay_grid_iface)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_infos.hh
similarity index 96%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_outline_infos.hh
index 19f561e50d9..5860b420f72 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
-#  include "gpu_index_load_info.hh"
+#  include "gpu_index_load_infos.hh"
 #  include "gpu_shader_create_info.hh"
 
 #  include "overlay_shader_shared.hh"
@@ -22,7 +22,7 @@
 #  define DRW_POINTCLOUD_INFO
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Outline Pre-pass
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_paint_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_paint_infos.hh
similarity index 97%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_paint_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_paint_infos.hh
index 00d7ae944fe..bf0b60ce0a4 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_paint_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_paint_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name OVERLAY_shader_paint_face.
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
similarity index 94%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
index 687b0c38cf7..84f9fb7b742 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
@@ -6,14 +6,14 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
 #  define CURVES_SHADER
 #  define DRW_HAIR_INFO
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_INTERFACE_INFO(overlay_sculpt_curves_selection_iface)
 SMOOTH(float, mask_weight)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_infos.hh
similarity index 89%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_infos.hh
index 0800cb5ac58..03e7292d6aa 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_infos.hh
@@ -6,11 +6,11 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_INTERFACE_INFO(overlay_sculpt_mask_iface)
 FLAT(float3, faceset_color)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
similarity index 95%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
index 166b094f7ad..0bb9906331e 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
@@ -6,9 +6,9 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "overlay_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "overlay_common_infos.hh"
 
 #  define CURVES_SHADER
 #  define DRW_HAIR_INFO
@@ -17,7 +17,7 @@
 #  define DRW_POINTCLOUD_INFO
 #endif
 
-#include "overlay_common_info.hh"
+#include "overlay_common_infos.hh"
 
 GPU_SHADER_INTERFACE_INFO(overlay_viewer_attribute_iface)
 SMOOTH(float4, final_color)
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_infos.hh
similarity index 97%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_volume_infos.hh
index 2cceddf0c75..90b1a735b65 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_infos.hh
@@ -6,9 +6,9 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "overlay_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "overlay_common_infos.hh"
 
 #  define USE_MAC
 #  define SHOW_RANGE
diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_infos.hh
similarity index 96%
rename from source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh
rename to source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_infos.hh
index e7a1890366d..76db3ca32fa 100644
--- a/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh
+++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_infos.hh
@@ -6,10 +6,10 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "gpu_index_load_info.hh"
-#  include "overlay_common_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_index_load_infos.hh"
+#  include "overlay_common_infos.hh"
 
 #  define CUSTOM_DEPTH_BIAS_CONST
 #endif
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
index d899020330d..789d524b360 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_antialiasing_info.hh"
+#include "infos/overlay_antialiasing_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_antialiasing)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_solid_frag.glsl
index 1e86171803e..2b9ce89cc7a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_solid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_solid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_dof)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_vert.glsl
index 0e157a8dced..190e17c1e95 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_dof_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_dof)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_outline_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_outline_vert.glsl
index df4f32e116a..cb8b11478e7 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_outline_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_outline_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_outline)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_frag.glsl
index 5d156fe61d0..3d11fb6b78a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_envelope_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
index 78a6a1e60a9..86d2d266449 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert.glsl
index 2ef7a607c18..fa7118916dc 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_outline)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_frag.glsl
index c765a9aa131..194df983aa1 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
index 14aefedc23c..489923eb42a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_frag.glsl
index d48fd0d7207..095d8f9bce8 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_vert.glsl
index 0d2986a4150..7e2b3339136 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_outline_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_outline_vert.glsl
index 16e0443fd21..fd9d0536b72 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_outline_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_outline_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_outline)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_frag.glsl
index 56ae53c0a7d..ab773c21779 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_sphere_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_vert.glsl
index 7a588ab33f5..c5245f39f74 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_solid)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_frag.glsl
index 1b0ca3827ed..1660f7442fb 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_stick)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_vert.glsl
index 7d97bb8dab7..a805813fec9 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_stick_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_stick)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_frag.glsl
index e5240ed3722..6da056e9162 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_armature_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_vert.glsl
index 7b4deed727d..3028b4890f4 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_armature_info.hh"
+#include "infos/overlay_armature_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_armature_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_background_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_background_frag.glsl
index 815df3980f9..a0c13ccd897 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_background_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_background_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_background_info.hh"
+#include "infos/overlay_background_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_background)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_clipbound_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_clipbound_vert.glsl
index 9d287e67dbf..39b1609849d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_clipbound_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_clipbound_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_background_info.hh"
+#include "infos/overlay_background_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_clipbound)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl
index 3ae29748042..59c87fd8772 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_depth_curves)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_frag.glsl
index 1108d4b2179..d90e9618eb9 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_depth_mesh_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_frag.glsl
index d5c5db3a86e..5ab9514dbb8 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_depth_gpencil)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_vert.glsl
index 7c06d33f15e..d40215f6718 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_depth_gpencil)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_mesh_conservative_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_mesh_conservative_vert.glsl
index 39ded5c5908..3aeb92c68c0 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_mesh_conservative_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_mesh_conservative_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh_conservative)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_pointcloud_vert.glsl
index f46076e67ec..9600c8c81e3 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_depth_pointcloud)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_vert.glsl
index 6c3d2e8f30a..472251fb3ba 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_handle_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_handle_vert.glsl
index 43bc268fe3a..ccff5b3321a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_handle_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_handle_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_handle)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_normals_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_normals_vert.glsl
index 08f53e3c45d..4139cda202b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_normals_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_normals_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_normals)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_point_vert.glsl
index aaa6f1d41b3..e2a8730de01 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_point)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_wire_vert.glsl
index 0808e8e06ab..88e7ec26a6e 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_curve_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_curves_handle_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_curves_handle_vert.glsl
index 053ab506133..9a0daa79544 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_curves_handle_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_curves_handle_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_curves_handle)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_canvas_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_canvas_vert.glsl
index ae0f0998180..5f58af80062 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_canvas_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_canvas_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_gpencil_canvas)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_point_vert.glsl
index 199774396b1..1464d4de444 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_point)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_wire_vert.glsl
index ed74731bda3..dffa279e847 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_frag.glsl
index 040ef3e1748..6a9632d03d6 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_analysis)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_vert.glsl
index dc4b9291831..86e1f672978 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_analysis)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl
index 5c9cee07f5e..e36d0bd265d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_depth_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_depth_vert.glsl
index 7db13313f9b..2d89b0c578c 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_depth_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_depth_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_depth)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_edge_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_edge_vert.glsl
index d75a661ad21..65b3915fe1f 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_edge_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_edge_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_edge)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_facedot_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_facedot_vert.glsl
index 0efe7ea960a..ee697d0c389 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_facedot_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_facedot_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_facedot)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_frag.glsl
index 4d8c10b11cc..4679db0779d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_edge)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_lib.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_lib.glsl
index 133ef5c9009..7b65c26edd6 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_lib.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common)
 SHADER_LIBRARY_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_normal_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_normal_vert.glsl
index b96df577bf5..6295c67da20 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_normal_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_normal_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_mesh_loop_normal)
 #ifdef GLSL_CPP_STUBS
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
index 3e23a9b0ab9..580ebe8c364 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_skin_root)
 #ifdef GLSL_CPP_STUBS
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
index a2c59bf9be5..7d7e5679a69 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_vert)
 #ifdef GLSL_CPP_STUBS
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_point_vert.glsl
index 00d2090bc4f..ab778478a13 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_point)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_strand_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_strand_vert.glsl
index 7556aa8647e..bd710593cfc 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_strand_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_particle_strand_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_strand)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_pointcloud_vert.glsl
index 37bdfc8e051..d0a397f7be2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_pointcloud)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_frag.glsl
index d6c84a42593..9faaa86c87c 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_edges)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_vert.glsl
index 99738f07462..59bd9e331da 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_edges)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_face_dots_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_face_dots_vert.glsl
index 656d31286d3..22bf96593c1 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_face_dots_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_face_dots_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_face_dots)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_faces_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_faces_vert.glsl
index c1246d83691..246ee061220 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_faces_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_faces_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_faces)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl
index 48309396af5..3e82d6c7ef5 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_mask_image)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_vert.glsl
index 033784852ff..3073f1830d2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_mask_image)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_stretching_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_stretching_vert.glsl
index dbaaadaefd2..e8973df6fef 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_stretching_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_stretching_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_stretching_area)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_tiled_image_borders_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_tiled_image_borders_vert.glsl
index 532b0c7a2a6..f9e38c71096 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_tiled_image_borders_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_tiled_image_borders_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_tiled_image_borders)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_frag.glsl
index 746a9b2841d..7bcb79f5697 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_verts)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_vert.glsl
index 43a94886755..bd0dbf67cfa 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_edit_mode_info.hh"
+#include "infos/overlay_edit_mode_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_verts)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_frag.glsl
index bfdd82952be..fc254af54ee 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_extra_groundline)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_groundline_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_groundline_vert.glsl
index 4b01795ef5d..7d1b0e12c66 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_groundline_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_groundline_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_groundline)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
index 7bf260293d6..cf7b0ede0df 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_grid_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_frag.glsl
index 3b0dc26e0a4..1ad746638ab 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_extra_loose_point_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_vert.glsl
index 8215f987689..7b3d503f5ea 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_loose_point_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_point_vert.glsl
index 59533ca8869..9bca5e33bbe 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_point_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_vert.glsl
index 193269c02cc..5b25aceea83 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_spot_cone)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_frag.glsl
index 6e7cfdb3b33..6de2779dc8c 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_extra_wire_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_vert.glsl
index 7c282bf2a09..baacd04cb39 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_extra_wire_object_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_facing_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_facing_frag.glsl
index 29609bbc8f2..2820d8fa143 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_facing_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_facing_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_facing_info.hh"
+#include "infos/overlay_facing_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_facing_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_facing_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_facing_vert.glsl
index 6049a385ebd..f6b003b7095 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_facing_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_facing_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_facing_info.hh"
+#include "infos/overlay_facing_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_facing_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_grid_background_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_grid_background_frag.glsl
index 3f9261b5f2c..060c1c80637 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_grid_background_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_grid_background_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_grid_info.hh"
+#include "infos/overlay_grid_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_grid_background)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_grid_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_grid_frag.glsl
index 2b60e3a39af..ac8f2a1899d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_grid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_grid_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_grid_info.hh"
+#include "infos/overlay_grid_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_grid_next)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
index 8c42ec6de8c..9342a24064b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_grid_info.hh"
+#include "infos/overlay_grid_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_grid_next)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl
index aa5cdf2cc99..8b18e53539e 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_image_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_image_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_image_vert.glsl
index e570af47b43..999f7f6bf84 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_image_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_image_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_image_base)
 VERTEX_SHADER_CREATE_INFO(draw_modelmat)
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_frag.glsl
index 6d2173eae5b..9cb407c4d21 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_motion_path_line)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
index 8ab8f20d55d..ccd28297abe 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_motion_path_line)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
index e62c4d875eb..22068f44835 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_motion_path_point)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
index 883dba9f53f..77f6fb937e4 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_outline_detect)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
index c9e3b40a246..25c5bfe1b04 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_curves)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_frag.glsl
index 9dd635c7cb3..877ce730678 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
index 65f6a1590a8..f175fbd02b7 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
index 87991e8e03a..d24e1206135 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
index 3368eca14d1..0756c4f1ab4 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_pointcloud)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
index 5e2088ccf78..3301be06d27 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_mesh)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
index 9094b32ebca..7af0a3d6c4d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_outline_info.hh"
+#include "infos/overlay_outline_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_face_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_face_vert.glsl
index 96c730e8eaf..abcbd4c556d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_face_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_face_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_paint_face)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_point_vert.glsl
index 92008e3bc85..5837f7d3a06 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_point_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_paint_point)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl
index 2075b2100bd..cdf19e9c569 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_paint_texture)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_vert.glsl
index 047025779b3..377058d8780 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_paint_texture)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_frag.glsl
index 4019de913fc..2c8c0821a35 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_paint_weight)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_vert.glsl
index c3cce61e809..2e7ccd9a375 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_weight_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_paint_weight)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_wire_vert.glsl
index 7bec1db8372..f3fcacda83b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_paint_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_wire_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_paint_wire)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_frag.glsl
index f1d2bff595b..04de651a6ed 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_particle_dot_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
index 09a078e1030..a900f1e27be 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
@@ -6,7 +6,7 @@
  * Draw particles as shapes using primitive expansion.
  */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_particle_hair)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_frag.glsl
index 8bcc3e2cc11..a81ed2fbd2b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_particle_shape_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_vert.glsl
index 614cbfc2ae0..ca960f865e2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_shape_vert.glsl
@@ -6,7 +6,7 @@
  * Draw particles as shapes using primitive expansion.
  */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_particle_shape)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_vert.glsl
index 8a106eb2841..b633e9e370a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_particle_dot)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
index 76bf55f7a40..9c841e805e8 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_extra_grid_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_varying_outline_aa_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_varying_outline_aa_frag.glsl
index 2ade823ee2b..a6e719a26c5 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_varying_outline_aa_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_varying_outline_aa_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_extra_info.hh"
+#include "infos/overlay_extra_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_extra_point_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_cage_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_cage_vert.glsl
index 27624d16089..8422cce9383 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_cage_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_cage_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_sculpt_curves_info.hh"
+#include "infos/overlay_sculpt_curves_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_cage)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_frag.glsl
index cfac84aa09e..4fff3feb32b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_sculpt_curves_info.hh"
+#include "infos/overlay_sculpt_curves_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_curves_selection)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl
index c1413604496..4efe164686d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_sculpt_curves_info.hh"
+#include "infos/overlay_sculpt_curves_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_selection)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_frag.glsl
index 70a23c34949..035a8417d5d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_sculpt_info.hh"
+#include "infos/overlay_sculpt_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_mask)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_vert.glsl
index 241cbc36cad..35ff8ce7940 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_sculpt_info.hh"
+#include "infos/overlay_sculpt_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_sculpt_mask)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl
index d39037c746a..545949a5e3d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_paint_info.hh"
+#include "infos/overlay_paint_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_paint_face)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_varying_color.glsl b/source/blender/draw/engines/overlay/shaders/overlay_varying_color.glsl
index 7ead6608125..69131791ccc 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_varying_color.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_varying_color.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_volume_info.hh"
+#include "infos/overlay_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curve_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curve_vert.glsl
index 4fc1bd76c09..6d27ece315d 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curve_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curve_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_viewer_attribute_info.hh"
+#include "infos/overlay_viewer_attribute_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curve)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl
index 5ecd99d2e36..4aef427d2c1 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_viewer_attribute_info.hh"
+#include "infos/overlay_viewer_attribute_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curves)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_frag.glsl
index fdef3f5a836..3ee96a690c8 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_viewer_attribute_info.hh"
+#include "infos/overlay_viewer_attribute_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_mesh_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_mesh_vert.glsl
index 7b76eb11742..b13d6e876d9 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_mesh_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_mesh_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_viewer_attribute_info.hh"
+#include "infos/overlay_viewer_attribute_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_mesh)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_pointcloud_vert.glsl
index 187247fb7b9..f74eca0dfc6 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_viewer_attribute_info.hh"
+#include "infos/overlay_viewer_attribute_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_volume_gridlines_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_volume_gridlines_vert.glsl
index abb9fedbb77..d802692559b 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_volume_gridlines_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_volume_gridlines_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_volume_info.hh"
+#include "infos/overlay_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_volume_gridlines_range)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_volume_velocity_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_volume_velocity_vert.glsl
index c6777ee7791..c401e50a0e2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_volume_velocity_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_volume_velocity_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_volume_info.hh"
+#include "infos/overlay_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_frag.glsl
index 7c613e5a63c..16caf92ebfa 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_wireframe_info.hh"
+#include "infos/overlay_wireframe_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_wireframe_base)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
index a93412157fb..e84343c0e39 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_wireframe_info.hh"
+#include "infos/overlay_wireframe_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(overlay_wireframe)
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_xray_fade_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_xray_fade_frag.glsl
index b463fbc9c95..1b5ad407a3f 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_xray_fade_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_xray_fade_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/overlay_antialiasing_info.hh"
+#include "infos/overlay_antialiasing_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(overlay_xray_fade)
 
diff --git a/source/blender/draw/engines/select/shaders/infos/select_id_info.hh b/source/blender/draw/engines/select/shaders/infos/select_id_infos.hh
similarity index 100%
rename from source/blender/draw/engines/select/shaders/infos/select_id_info.hh
rename to source/blender/draw/engines/select/shaders/infos/select_id_infos.hh
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_infos.hh
similarity index 97%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_composite_infos.hh
index 6131593df96..16cb77aefa9 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_infos.hh
@@ -10,8 +10,8 @@
 
 #  include "workbench_shader_shared.hh"
 
-#  include "draw_view_info.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define WORKBENCH_LIGHTING_STUDIO
 #  define WORKBENCH_LIGHTING_MATCAP
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_depth_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_depth_infos.hh
similarity index 93%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_depth_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_depth_infos.hh
index fdf7297e84a..de406694839 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_depth_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_depth_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
similarity index 98%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
index ce63145ad5a..a9a0d6afe85 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  define SMAA_GLSL_3
 #  define SMAA_STAGE 1
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
index 5223b1483c5..a7e87c253f5 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
@@ -8,7 +8,7 @@
 
 #  include "workbench_shader_shared.hh"
 
-#  include "draw_view_info.hh"
+#  include "draw_view_infos.hh"
 #  include "gpu_shader_fullscreen_info.hh"
 
 #  define PREPARE
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_infos.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_infos.hh
new file mode 100644
index 00000000000..fe7cf129802
--- /dev/null
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_infos.hh
@@ -0,0 +1,93 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifdef GPU_SHADER
+#  pragma once
+#  include "gpu_shader_compat.hh"
+
+#  include "workbench_shader_shared.hh"
+
+#  include "draw_view_infos.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
+
+#  define PREPARE
+#  define DOWNSAMPLE
+#  define BLUR1
+#  define BLUR2
+#  define RESOLVE
+#  define NUM_SAMPLES 49
+#endif
+
+#include "gpu_shader_create_info.hh"
+
+/*
+ * NOTE: Keep the sampler bind points consistent between the steps.
+ *
+ * SAMPLER(0, sampler2D, input_coc_tx)
+ * SAMPLER(1, sampler2D, scene_color_tx)
+ * SAMPLER(2, sampler2D, scene_depth_tx)
+ * SAMPLER(3, sampler2D, half_res_color_tx)
+ * SAMPLER(4, sampler2D, blur_tx)
+ * SAMPLER(5, sampler2D, noise_tx)
+ */
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof)
+PUSH_CONSTANT(float2, inverted_viewport_size)
+PUSH_CONSTANT(float2, near_far)
+PUSH_CONSTANT(float3, dof_params)
+PUSH_CONSTANT(float, noise_offset)
+ADDITIONAL_INFO(gpu_fullscreen)
+ADDITIONAL_INFO(draw_view)
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof_prepare)
+SAMPLER(1, sampler2D, scene_color_tx)
+SAMPLER(2, sampler2D, scene_depth_tx)
+FRAGMENT_OUT(0, float4, halfResColor)
+FRAGMENT_OUT(1, float2, normalizedCoc)
+FRAGMENT_SOURCE("workbench_effect_dof_prepare_frag.glsl")
+ADDITIONAL_INFO(workbench_effect_dof)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof_downsample)
+SAMPLER(0, sampler2D, input_coc_tx)
+SAMPLER(1, sampler2D, scene_color_tx)
+FRAGMENT_OUT(0, float4, outColor)
+FRAGMENT_OUT(1, float2, outCocs)
+FRAGMENT_SOURCE("workbench_effect_dof_downsample_frag.glsl")
+ADDITIONAL_INFO(workbench_effect_dof)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof_blur1)
+DEFINE_VALUE("NUM_SAMPLES", "49")
+SAMPLER(0, sampler2D, input_coc_tx)
+SAMPLER(3, sampler2D, half_res_color_tx)
+SAMPLER(5, sampler2D, noise_tx)
+UNIFORM_BUF(1, float4, samples[49])
+FRAGMENT_OUT(0, float4, blurColor)
+FRAGMENT_SOURCE("workbench_effect_dof_blur1_frag.glsl")
+ADDITIONAL_INFO(workbench_effect_dof)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof_blur2)
+SAMPLER(0, sampler2D, input_coc_tx)
+SAMPLER(4, sampler2D, blur_tx)
+FRAGMENT_OUT(0, float4, final_color)
+FRAGMENT_SOURCE("workbench_effect_dof_blur2_frag.glsl")
+ADDITIONAL_INFO(workbench_effect_dof)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(workbench_effect_dof_resolve)
+SAMPLER(2, sampler2D, scene_depth_tx)
+SAMPLER(3, sampler2D, half_res_color_tx)
+FRAGMENT_OUT_DUAL(0, float4, final_colorAdd, SRC_0)
+FRAGMENT_OUT_DUAL(0, float4, final_colorMul, SRC_1)
+FRAGMENT_SOURCE("workbench_effect_dof_resolve_frag.glsl")
+ADDITIONAL_INFO(workbench_effect_dof)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
similarity index 93%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
index d2d15129683..6f821aff2cb 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 
 #  include "workbench_shader_shared.hh"
 #endif
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_infos.hh
similarity index 98%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_infos.hh
index 58217839f3d..b0b4fe74da6 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_infos.hh
@@ -9,8 +9,8 @@
 
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
 
 #  include "workbench_shader_shared.hh"
 #  define WORKBENCH_COLOR_MATERIAL
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_infos.hh
similarity index 97%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_infos.hh
index 31a6ff618f3..4542fe43eed 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_infos.hh
@@ -9,9 +9,9 @@
 
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
-#  include "draw_view_info.hh"
-#  include "gpu_index_load_info.hh"
+#  include "draw_object_infos_infos.hh"
+#  include "draw_view_infos.hh"
+#  include "gpu_index_load_infos.hh"
 
 #  include "workbench_shader_shared.hh"
 #  define DYNAMIC_PASS_SELECTION
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
similarity index 92%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
index 92190b37a2e..16c69bbb419 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
@@ -6,7 +6,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_infos.hh
similarity index 99%
rename from source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh
rename to source/blender/draw/engines/workbench/shaders/infos/workbench_volume_infos.hh
index c5e0c64861c..6c2541e9466 100644
--- a/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh
+++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_infos.hh
@@ -8,7 +8,7 @@
 
 #  include "gpu_shader_compat.hh"
 
-#  include "draw_object_infos_info.hh"
+#  include "draw_object_infos_infos.hh"
 
 #  include "workbench_shader_shared.hh"
 #  define VOLUME_SMOKE
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
index 04d50a5e9bb..e2321f575c3 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
-#include "infos/workbench_composite_info.hh"
+#include "infos/workbench_composite_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "workbench_common_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
index 8a5482ee74b..07c8e044d41 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_composite_info.hh"
+#include "infos/workbench_composite_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_composite)
 FRAGMENT_SHADER_CREATE_INFO(workbench_resolve_opaque_matcap)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur1_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur1_frag.glsl
index 8f501a79f6d..4b42f27d07e 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur1_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur1_frag.glsl
@@ -8,7 +8,7 @@
  * Converted and adapted from HLSL to GLSL by Clément Foucault
  */
 
-#include "infos/workbench_effect_dof_info.hh"
+#include "infos/workbench_effect_dof_infos.hh"
 
 #include "gpu_shader_math_constants_lib.glsl"
 #include "workbench_effect_dof_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur2_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur2_frag.glsl
index 4f3a1588dd7..d3bc1d2a613 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur2_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur2_frag.glsl
@@ -8,7 +8,7 @@
  * Converted and adapted from HLSL to GLSL by Clément Foucault
  */
 
-#include "infos/workbench_effect_dof_info.hh"
+#include "infos/workbench_effect_dof_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "gpu_shader_utildefines_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
index c48d291a422..890e7386ca3 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
@@ -8,7 +8,7 @@
  * Converted and adapted from HLSL to GLSL by Clément Foucault
  */
 
-#include "infos/workbench_effect_dof_info.hh"
+#include "infos/workbench_effect_dof_infos.hh"
 
 #include "gpu_shader_math_safe_lib.glsl"
 #include "gpu_shader_math_vector_reduce_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_prepare_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_prepare_frag.glsl
index 0ca690c1cc9..508d2d5dcb0 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_prepare_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_prepare_frag.glsl
@@ -8,7 +8,7 @@
  * Converted and adapted from HLSL to GLSL by Clément Foucault
  */
 
-#include "infos/workbench_effect_dof_info.hh"
+#include "infos/workbench_effect_dof_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "gpu_shader_math_safe_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_resolve_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_resolve_frag.glsl
index 4319947204d..a0135f108f9 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_resolve_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_resolve_frag.glsl
@@ -8,7 +8,7 @@
  * Converted and adapted from HLSL to GLSL by Clément Foucault
  */
 
-#include "infos/workbench_effect_dof_info.hh"
+#include "infos/workbench_effect_dof_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "gpu_shader_utildefines_lib.glsl"
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl
index a0642021cb2..b60df62ffd1 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_effect_outline_info.hh"
+#include "infos/workbench_effect_outline_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_effect_outline)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl
index 2d47d7d2573..42655db7687 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_effect_antialiasing_info.hh"
+#include "infos/workbench_effect_antialiasing_infos.hh"
 
 /* Adjust according to SMAA_STAGE for C++ compilation. */
 FRAGMENT_SHADER_CREATE_INFO(workbench_smaa_stage_1)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl
index 110c91e6200..21e99efe082 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_effect_antialiasing_info.hh"
+#include "infos/workbench_effect_antialiasing_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_smaa)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl
index 393456cc10f..0fa556cee11 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_effect_antialiasing_info.hh"
+#include "infos/workbench_effect_antialiasing_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_taa)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl
index f3cc8660736..b7f905110ed 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(workbench_color_texture)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl
index af51daeaeb1..0ad45fb55f0 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(workbench_prepass)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl
index 945d0ec40ce..3faa9f77922 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 // SHADER_LIBRARY_CREATE_INFO(workbench_color_material)
 SHADER_LIBRARY_CREATE_INFO(workbench_color_texture)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_merge_depth_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_merge_depth_frag.glsl
index df380831ec3..9ac50d634fb 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_merge_depth_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_merge_depth_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_depth_info.hh"
+#include "infos/workbench_depth_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_merge_depth)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_overlay_depth_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_overlay_depth_frag.glsl
index 233ddaf4adf..f970fe1ee6d 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_overlay_depth_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_overlay_depth_frag.glsl
@@ -4,7 +4,7 @@
 
 /* Prepare the Depth Buffer for the Overlay Engine. */
 
-#include "infos/workbench_depth_info.hh"
+#include "infos/workbench_depth_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_overlay_depth)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
index e9bd03a946a..55e6e3d4a8b 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_prepass)
 FRAGMENT_SHADER_CREATE_INFO(workbench_opaque)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
index 44996e37d45..ccf0587c8bc 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_prepass)
 VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl
index a4528cf5d89..3582be510f9 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_prepass)
 VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
index 17a721ae7e1..6eeae4a1ff1 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_prepass)
 VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert.glsl
index 38ad5c5bed3..1c62546c562 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert.glsl
@@ -16,7 +16,7 @@
  * execute the vertex shader code on each of the input primitive's vertices.
  */
 
-#include "infos/workbench_shadow_info.hh"
+#include "infos/workbench_shadow_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl
index 0a2b74708db..8659333398e 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_shadow_info.hh"
+#include "infos/workbench_shadow_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_shadow_debug)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_lib.glsl
index d6ca388a29d..61f6792b885 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/workbench_shadow_info.hh"
+#include "infos/workbench_shadow_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl
index 9f41220aad6..efda45fcacb 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl
@@ -17,7 +17,7 @@
  * execute the vertex shader code on each of the input primitive's vertices.
  */
 
-#include "infos/workbench_shadow_info.hh"
+#include "infos/workbench_shadow_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
index 3e75cb159ae..1969f7ccd05 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_shadow_info.hh"
+#include "infos/workbench_shadow_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(workbench_shadow_visibility_compute_dynamic_pass_type)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl
index c4ecd0a6719..3d327e134e2 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_prepass)
 FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_accum)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl
index 015dff68136..d437233a368 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl
@@ -7,7 +7,7 @@
  * Computer Graphics Techniques (JCGT), vol. 2, no. 2, 122–141, 2013
  */
 
-#include "infos/workbench_transparent_resolve_info.hh"
+#include "infos/workbench_transparent_resolve_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_resolve)
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl
index 24df0b1ab8c..e92fd072678 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_volume_info.hh"
+#include "infos/workbench_volume_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(workbench_volume)
 FRAGMENT_SHADER_CREATE_INFO(workbench_volume_slice)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl
index 69215f7bbff..9e846329a58 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/workbench_volume_info.hh"
+#include "infos/workbench_volume_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(workbench_volume)
 VERTEX_SHADER_CREATE_INFO(workbench_volume_slice)
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
index 302c586f406..b6e4722a253 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/workbench_prepass_info.hh"
+#include "infos/workbench_prepass_infos.hh"
 
 #ifdef GPU_LIBRARY_SHADER
 SHADER_LIBRARY_CREATE_INFO(workbench_prepass)
diff --git a/source/blender/draw/intern/shaders/draw_command_generate_comp.glsl b/source/blender/draw/intern/shaders/draw_command_generate_comp.glsl
index ff5b322d9d6..218176f396d 100644
--- a/source/blender/draw/intern/shaders/draw_command_generate_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_command_generate_comp.glsl
@@ -6,7 +6,7 @@
  * Convert DrawPrototype into draw commands.
  */
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(draw_command_generate)
 
diff --git a/source/blender/draw/intern/shaders/draw_curves_info.hh b/source/blender/draw/intern/shaders/draw_curves_info.hh
index 684369ce0bb..443dcd7dc65 100644
--- a/source/blender/draw/intern/shaders/draw_curves_info.hh
+++ b/source/blender/draw/intern/shaders/draw_curves_info.hh
@@ -11,7 +11,7 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "draw_attribute_shader_shared.hh"
-#  include "draw_object_infos_info.hh"
+#  include "draw_object_infos_infos.hh"
 
 #  define DRW_HAIR_INFO
 #endif
diff --git a/source/blender/draw/intern/shaders/draw_curves_infos.hh b/source/blender/draw/intern/shaders/draw_curves_infos.hh
new file mode 100644
index 00000000000..443dcd7dc65
--- /dev/null
+++ b/source/blender/draw/intern/shaders/draw_curves_infos.hh
@@ -0,0 +1,133 @@
+/* SPDX-FileCopyrightText: 2025 Blender Authors
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+/** \file
+ * \ingroup draw
+ */
+
+#ifdef GPU_SHADER
+#  pragma once
+#  include "gpu_shader_compat.hh"
+
+#  include "draw_attribute_shader_shared.hh"
+#  include "draw_object_infos_infos.hh"
+
+#  define DRW_HAIR_INFO
+#endif
+
+#include "draw_curves_defines.hh"
+
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_CREATE_INFO(draw_curves_topology)
+LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
+/* Offsets giving the start and end of the curve. */
+STORAGE_BUF(0, read, int, evaluated_offsets_buf[])
+STORAGE_BUF(1, read, uint, curves_cyclic_buf[]) /* Actually bool (1 byte). */
+STORAGE_BUF(2, write, int, indirection_buf[])
+PUSH_CONSTANT(int, curves_start)
+PUSH_CONSTANT(int, curves_count)
+PUSH_CONSTANT(bool, is_ribbon_topology)
+PUSH_CONSTANT(bool, use_cyclic)
+COMPUTE_SOURCE("draw_curves_topology_comp.glsl")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_data)
+LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
+/* Offsets giving the start and end of the curve. */
+STORAGE_BUF(EVALUATED_POINT_SLOT, read, int, evaluated_points_by_curve_buf[])
+STORAGE_BUF(POINTS_BY_CURVES_SLOT, read, int, points_by_curve_buf[])
+STORAGE_BUF(CURVE_RESOLUTION_SLOT, read, uint, curves_resolution_buf[])
+STORAGE_BUF(CURVE_TYPE_SLOT, read, uint, curves_type_buf[])     /* Actually int8_t. */
+STORAGE_BUF(CURVE_CYCLIC_SLOT, read, uint, curves_cyclic_buf[]) /* Actually bool (1 byte). */
+/* Bezier handles (if needed). */
+STORAGE_BUF(HANDLES_POS_LEFT_SLOT, read, float, handles_positions_left_buf[])
+STORAGE_BUF(HANDLES_POS_RIGHT_SLOT, read, float, handles_positions_right_buf[])
+STORAGE_BUF(BEZIER_OFFSETS_SLOT, read, int, bezier_offsets_buf[])
+/* Nurbs (alias of other buffers).  */
+// STORAGE_BUF(CURVES_ORDER_SLOT, read, uint, curves_order_buf[])  /* Actually int8_t. */
+// STORAGE_BUF(BASIS_CACHE_SLOT, read, float, basis_cache_buf[])
+// STORAGE_BUF(CONTROL_WEIGHTS_SLOT, read, float, control_weights_buf[])
+// STORAGE_BUF(BASIS_CACHE_OFFSET_SLOT, read, int, basis_cache_offset_buf[])
+PUSH_CONSTANT(int, curves_start)
+PUSH_CONSTANT(int, curves_count)
+PUSH_CONSTANT(bool, use_point_weight)
+PUSH_CONSTANT(bool, use_cyclic)
+/** IMPORTANT: For very dumb reasons, on GL the default specialization is compiled and used for
+ * creating the shader interface. If this happens to optimize out some push_constants that are
+ * valid in other specialization, we will never be able to set them. So choose the specialization
+ * that uses all push_constants. */
+SPECIALIZATION_CONSTANT(int, evaluated_type, 3) /* CURVE_TYPE_NURBS */
+TYPEDEF_SOURCE("draw_attribute_shader_shared.hh")
+COMPUTE_SOURCE("draw_curves_interpolation_comp.glsl")
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_interpolate_position)
+ADDITIONAL_INFO(draw_curves_data)
+/* Attributes. */
+STORAGE_BUF(POINT_POSITIONS_SLOT, read, float, positions_buf[])
+STORAGE_BUF(POINT_RADII_SLOT, read, float, radii_buf[])
+/* Outputs. */
+STORAGE_BUF(EVALUATED_POS_RAD_SLOT, read_write, float4, evaluated_positions_radii_buf[])
+PUSH_CONSTANT(float4x4, transform)
+COMPUTE_FUNCTION("evaluate_position_radius")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float4_attribute)
+ADDITIONAL_INFO(draw_curves_data)
+STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat4, attribute_float4_buf[])
+STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat4, evaluated_float4_buf[])
+COMPUTE_FUNCTION("evaluate_attribute_float4")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float3_attribute)
+ADDITIONAL_INFO(draw_curves_data)
+STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat3, attribute_float3_buf[])
+STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat3, evaluated_float3_buf[])
+COMPUTE_FUNCTION("evaluate_attribute_float3")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float2_attribute)
+ADDITIONAL_INFO(draw_curves_data)
+STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat2, attribute_float2_buf[])
+STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat2, evaluated_float2_buf[])
+COMPUTE_FUNCTION("evaluate_attribute_float2")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float_attribute)
+ADDITIONAL_INFO(draw_curves_data)
+STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat, attribute_float_buf[])
+STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat, evaluated_float_buf[])
+COMPUTE_FUNCTION("evaluate_attribute_float")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_evaluate_length_intercept)
+LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
+STORAGE_BUF(EVALUATED_POINT_SLOT, read, int, evaluated_points_by_curve_buf[])
+STORAGE_BUF(EVALUATED_POS_RAD_SLOT, read, float4, evaluated_positions_radii_buf[])
+STORAGE_BUF(EVALUATED_TIME_SLOT, read_write, float, evaluated_time_buf[])
+STORAGE_BUF(CURVES_LENGTH_SLOT, write, float, curves_length_buf[])
+PUSH_CONSTANT(int, curves_start)
+PUSH_CONSTANT(int, curves_count)
+PUSH_CONSTANT(bool, use_cyclic)
+COMPUTE_FUNCTION("evaluate_length_intercept")
+COMPUTE_SOURCE("draw_curves_length_intercept_comp.glsl")
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
+
+GPU_SHADER_CREATE_INFO(draw_curves_test)
+STORAGE_BUF(0, write, float, result_pos_buf[])
+STORAGE_BUF(1, write, int4, result_indices_buf[])
+VERTEX_SOURCE("draw_curves_test.glsl")
+FRAGMENT_SOURCE("draw_curves_test.glsl")
+ADDITIONAL_INFO(draw_curves_infos)
+ADDITIONAL_INFO(draw_curves)
+DO_STATIC_COMPILATION()
+GPU_SHADER_CREATE_END()
diff --git a/source/blender/draw/intern/shaders/draw_curves_interpolation_comp.glsl b/source/blender/draw/intern/shaders/draw_curves_interpolation_comp.glsl
index 867224271f2..df648e9c208 100644
--- a/source/blender/draw/intern/shaders/draw_curves_interpolation_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_curves_interpolation_comp.glsl
@@ -9,7 +9,7 @@
  * Equivalent of `CurvesGeometry::evaluated_positions()`.
  */
 
-#include "draw_curves_info.hh"
+#include "draw_curves_infos.hh"
 
 #include "gpu_shader_attribute_load_lib.glsl"
 #include "gpu_shader_math_matrix_transform_lib.glsl"
diff --git a/source/blender/draw/intern/shaders/draw_curves_length_intercept_comp.glsl b/source/blender/draw/intern/shaders/draw_curves_length_intercept_comp.glsl
index 145576d80a5..1f08cb26eb3 100644
--- a/source/blender/draw/intern/shaders/draw_curves_length_intercept_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_curves_length_intercept_comp.glsl
@@ -7,7 +7,7 @@
  * One thread processes one curve.
  */
 
-#include "draw_curves_info.hh"
+#include "draw_curves_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(draw_curves_evaluate_length_intercept)
 
diff --git a/source/blender/draw/intern/shaders/draw_curves_lib.glsl b/source/blender/draw/intern/shaders/draw_curves_lib.glsl
index 87352cd9883..aec2b1f1b80 100644
--- a/source/blender/draw/intern/shaders/draw_curves_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_curves_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #include "gpu_shader_math_constants_lib.glsl"
 #include "gpu_shader_math_matrix_conversion_lib.glsl"
diff --git a/source/blender/draw/intern/shaders/draw_curves_test.glsl b/source/blender/draw/intern/shaders/draw_curves_test.glsl
index f7d87f2e3d5..9a6341e4116 100644
--- a/source/blender/draw/intern/shaders/draw_curves_test.glsl
+++ b/source/blender/draw/intern/shaders/draw_curves_test.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "draw_curves_info.hh"
+#include "draw_curves_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(draw_curves_test)
 
diff --git a/source/blender/draw/intern/shaders/draw_curves_topology_comp.glsl b/source/blender/draw/intern/shaders/draw_curves_topology_comp.glsl
index a2b6320028d..f8aaac629c0 100644
--- a/source/blender/draw/intern/shaders/draw_curves_topology_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_curves_topology_comp.glsl
@@ -7,7 +7,7 @@
  * One thread processes one curve.
  */
 
-#include "draw_curves_info.hh"
+#include "draw_curves_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(draw_curves_topology)
 
diff --git a/source/blender/draw/intern/shaders/draw_debug_draw_display_frag.glsl b/source/blender/draw/intern/shaders/draw_debug_draw_display_frag.glsl
index df154a98659..8553ee83ee0 100644
--- a/source/blender/draw/intern/shaders/draw_debug_draw_display_frag.glsl
+++ b/source/blender/draw/intern/shaders/draw_debug_draw_display_frag.glsl
@@ -6,7 +6,7 @@
  * Display debug edge list.
  */
 
-#include "draw_debug_info.hh"
+#include "draw_debug_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(draw_debug_draw_display)
 
diff --git a/source/blender/draw/intern/shaders/draw_debug_draw_display_vert.glsl b/source/blender/draw/intern/shaders/draw_debug_draw_display_vert.glsl
index cf23a080005..a3a8c090a9a 100644
--- a/source/blender/draw/intern/shaders/draw_debug_draw_display_vert.glsl
+++ b/source/blender/draw/intern/shaders/draw_debug_draw_display_vert.glsl
@@ -6,7 +6,7 @@
  * Display debug edge list.
  */
 
-#include "draw_debug_info.hh"
+#include "draw_debug_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(draw_debug_draw_display)
 
diff --git a/source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl b/source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl
index f4491600192..04fdc7ba221 100644
--- a/source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_debug_info.hh"
+#include "draw_debug_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(draw_debug_draw)
 
diff --git a/source/blender/draw/intern/shaders/draw_debug_info.hh b/source/blender/draw/intern/shaders/draw_debug_infos.hh
similarity index 100%
rename from source/blender/draw/intern/shaders/draw_debug_info.hh
rename to source/blender/draw/intern/shaders/draw_debug_infos.hh
diff --git a/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl b/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl
index 24cfaaf3e1c..09b15560689 100644
--- a/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(draw_gpencil)
 
diff --git a/source/blender/draw/intern/shaders/draw_intersect_lib.glsl b/source/blender/draw/intern/shaders/draw_intersect_lib.glsl
index 172020ffbe5..c56102fb9e1 100644
--- a/source/blender/draw/intern/shaders/draw_intersect_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_intersect_lib.glsl
@@ -9,7 +9,7 @@
  * Results are meant to be conservative.
  */
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 #include "draw_shape_lib.glsl"
 #include "gpu_shader_math_base_lib.glsl"
diff --git a/source/blender/draw/intern/shaders/draw_model_lib.glsl b/source/blender/draw/intern/shaders/draw_model_lib.glsl
index 7e23730f42d..0dc655b3744 100644
--- a/source/blender/draw/intern/shaders/draw_model_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_model_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 #include "draw_view_lib.glsl"
 
diff --git a/source/blender/draw/intern/shaders/draw_object_infos_info.hh b/source/blender/draw/intern/shaders/draw_object_infos_infos.hh
similarity index 98%
rename from source/blender/draw/intern/shaders/draw_object_infos_info.hh
rename to source/blender/draw/intern/shaders/draw_object_infos_infos.hh
index 4c66f6843c4..54985daabd8 100644
--- a/source/blender/draw/intern/shaders/draw_object_infos_info.hh
+++ b/source/blender/draw/intern/shaders/draw_object_infos_infos.hh
@@ -9,7 +9,7 @@
 #  include "draw_shader_shared.hh"
 #  include "gpencil_shader_shared.hh"
 
-#  include "draw_view_info.hh"
+#  include "draw_view_infos.hh"
 
 #  define CURVES_SHADER
 #  define DRW_GPENCIL_INFO
diff --git a/source/blender/draw/intern/shaders/draw_object_infos_lib.glsl b/source/blender/draw/intern/shaders/draw_object_infos_lib.glsl
index 0a08144a263..e7f5f4e01e4 100644
--- a/source/blender/draw/intern/shaders/draw_object_infos_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_object_infos_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_object_infos_info.hh"
+#include "draw_object_infos_infos.hh"
 
 #include "draw_model_lib.glsl"
 
diff --git a/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl b/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
index fd402ff57d5..be14afe8b92 100644
--- a/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
@@ -6,7 +6,7 @@
  * Finish computation of a few draw resource after sync.
  */
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 #include "gpu_shader_math_matrix_transform_lib.glsl"
 #include "gpu_shader_math_vector_reduce_lib.glsl"
diff --git a/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl b/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl
index 5407c70bd5f..c6c980db886 100644
--- a/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl
@@ -6,7 +6,7 @@
  * Compute culling data for each views of a given view buffer.
  */
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 #include "draw_view_lib.glsl"
 #include "gpu_shader_math_matrix_transform_lib.glsl"
diff --git a/source/blender/draw/intern/shaders/draw_view_info.hh b/source/blender/draw/intern/shaders/draw_view_infos.hh
similarity index 100%
rename from source/blender/draw/intern/shaders/draw_view_info.hh
rename to source/blender/draw/intern/shaders/draw_view_infos.hh
diff --git a/source/blender/draw/intern/shaders/draw_view_lib.glsl b/source/blender/draw/intern/shaders/draw_view_lib.glsl
index 2fb79968cb7..f88b1dd70c3 100644
--- a/source/blender/draw/intern/shaders/draw_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/draw_view_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(draw_view)
 
diff --git a/source/blender/draw/intern/shaders/draw_visibility_comp.glsl b/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
index 5afa77a5028..b1252c70aff 100644
--- a/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
@@ -7,7 +7,7 @@
  */
 /* TODO(fclem): This could be augmented by a 2 pass occlusion culling system. */
 
-#include "draw_view_info.hh"
+#include "draw_view_infos.hh"
 
 #include "draw_intersect_lib.glsl"
 
diff --git a/source/blender/draw/intern/shaders/subdiv_info.hh b/source/blender/draw/intern/shaders/subdiv_infos.hh
similarity index 100%
rename from source/blender/draw/intern/shaders/subdiv_info.hh
rename to source/blender/draw/intern/shaders/subdiv_infos.hh
diff --git a/source/blender/draw/intern/shaders/subdiv_lib.glsl b/source/blender/draw/intern/shaders/subdiv_lib.glsl
index e59a11276b6..82c3403b4e8 100644
--- a/source/blender/draw/intern/shaders/subdiv_lib.glsl
+++ b/source/blender/draw/intern/shaders/subdiv_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "subdiv_info.hh"
+#include "subdiv_infos.hh"
 
 #ifdef SUBDIV_POLYGON_OFFSET
 COMPUTE_SHADER_CREATE_INFO(subdiv_polygon_offset_base)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 25288fce427..f6a1dc3bc59 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -155,7 +155,6 @@ set(SRC
   intern/gpu_query.hh
   intern/gpu_select_private.hh
   intern/gpu_shader_create_info.hh
-  intern/gpu_shader_create_info_list.hh
   intern/gpu_shader_create_info_private.hh
   intern/gpu_shader_dependency_private.hh
   intern/gpu_shader_interface.hh
@@ -450,6 +449,43 @@ endif()
 set(GLSL_SRC
   GPU_shader_shared.hh
 
+  shaders/infos/gpu_clip_planes_infos.hh
+  shaders/infos/gpu_index_load_infos.hh
+  shaders/infos/gpu_interface_infos.hh
+  shaders/infos/gpu_shader_2D_area_borders_infos.hh
+  shaders/infos/gpu_shader_2D_checker_infos.hh
+  shaders/infos/gpu_shader_2D_diag_stripes_infos.hh
+  shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
+  shaders/infos/gpu_shader_2D_image_infos.hh
+  shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
+  shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh
+  shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
+  shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
+  shaders/infos/gpu_shader_2D_node_socket_infos.hh
+  shaders/infos/gpu_shader_2D_nodelink_infos.hh
+  shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
+  shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
+  shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
+  shaders/infos/gpu_shader_2D_widget_infos.hh
+  shaders/infos/gpu_shader_3D_depth_only_infos.hh
+  shaders/infos/gpu_shader_3D_flat_color_infos.hh
+  shaders/infos/gpu_shader_3D_image_infos.hh
+  shaders/infos/gpu_shader_3D_point_infos.hh
+  shaders/infos/gpu_shader_3D_polyline_infos.hh
+  shaders/infos/gpu_shader_3D_smooth_color_infos.hh
+  shaders/infos/gpu_shader_3D_uniform_color_infos.hh
+  shaders/infos/gpu_shader_fullscreen_infos.hh
+  shaders/infos/gpu_shader_gpencil_stroke_infos.hh
+  shaders/infos/gpu_shader_icon_infos.hh
+  shaders/infos/gpu_shader_index_infos.hh
+  shaders/infos/gpu_shader_keyframe_shape_infos.hh
+  shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
+  shaders/infos/gpu_shader_print_infos.hh
+  shaders/infos/gpu_shader_sequencer_infos.hh
+  shaders/infos/gpu_shader_simple_lighting_infos.hh
+  shaders/infos/gpu_shader_text_infos.hh
+  shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
+
   shaders/gpu_shader_depth_only_frag.glsl
   shaders/gpu_shader_uniform_color_frag.glsl
   shaders/gpu_shader_checker_frag.glsl
@@ -672,6 +708,8 @@ set(GLSL_SRC
 )
 
 set(GLSL_SRC_TEST
+  shaders/infos/gpu_shader_test_infos.hh
+
   tests/shaders/gpu_math_test.glsl
   tests/shaders/gpu_buffer_texture_test.glsl
   tests/shaders/gpu_compute_1d_test.glsl
@@ -687,6 +725,9 @@ set(GLSL_SRC_TEST
 )
 
 set(MTL_BACKEND_GLSL_SRC
+  metal/kernels/depth_2d_update_infos.hh
+  metal/kernels/gpu_shader_fullscreen_blit_infos.hh
+
   metal/kernels/depth_2d_update_float_frag.glsl
   metal/kernels/depth_2d_update_int24_frag.glsl
   metal/kernels/depth_2d_update_int32_frag.glsl
@@ -714,6 +755,8 @@ set(MSL_SRC
 )
 
 set(VULKAN_BACKEND_GLSL_SRC
+  vulkan/shaders/vk_backbuffer_blit_infos.hh
+
   vulkan/shaders/vk_backbuffer_blit_comp.glsl
 )
 
@@ -756,11 +799,13 @@ list(APPEND LIB
 
 set(GLSL_SOURCE_CONTENT "")
 set(GLSL_METADATA_CONTENT "")
+set(GLSL_INFOS_CONTENT "")
 foreach(GLSL_FILE ${GLSL_SRC})
   get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
   string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
   string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
   string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
+  string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
 endforeach()
 
 set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_source_list.h")
@@ -769,6 +814,9 @@ list(APPEND SRC ${glsl_source_list_file})
 set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_metadata_list.hh")
 file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
 list(APPEND SRC ${glsl_metadata_list_file})
+set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_infos_list.hh")
+file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
+list(APPEND SRC ${glsl_infos_list_file})
 list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
 
 if(WITH_MOD_FLUID)
diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.cc b/source/blender/gpu/glsl_preprocess/glsl_preprocess.cc
index 37ff1cc5d67..7e6424120d5 100644
--- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.cc
+++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.cc
@@ -16,8 +16,9 @@
 
 int main(int argc, char **argv)
 {
-  if (argc != 4) {
-    std::cerr << "Usage: glsl_preprocess <data_file_from> <data_file_to> <metadata_file_to>"
+  if (argc != 5) {
+    std::cerr << "Usage: glsl_preprocess <data_file_from> <data_file_to> <metadata_file_to> "
+                 "<infos_file_to>"
               << std::endl;
     exit(1);
   }
@@ -25,6 +26,7 @@ int main(int argc, char **argv)
   const char *input_file_name = argv[1];
   const char *output_file_name = argv[2];
   const char *metadata_file_name = argv[3];
+  const char *infos_file_name = argv[4];
 
   /* Open the input file for reading */
   std::ifstream input_file(input_file_name);
@@ -62,6 +64,14 @@ int main(int argc, char **argv)
     exit(1);
   }
 
+  /* Open the output file for writing */
+  std::ofstream infos_file(infos_file_name, std::ofstream::out | std::ofstream::binary);
+  if (!output_file) {
+    std::cerr << "Error: Could not open output file " << infos_file_name << std::endl;
+    input_file.close();
+    exit(1);
+  }
+
   std::stringstream buffer;
   buffer << input_file.rdbuf();
 
@@ -78,7 +88,7 @@ int main(int argc, char **argv)
         error++;
       };
   std::string filename(output_file_name);
-  const bool is_info = filename.find("info.hh") != std::string::npos;
+  const bool is_info = filename.find("infos.hh") != std::string::npos;
   const bool is_glsl = filename.find(".glsl") != std::string::npos;
   const bool is_shared = filename.find("shared.h") != std::string::npos;
   const bool is_library = is_glsl &&
@@ -86,12 +96,6 @@ int main(int argc, char **argv)
                            filename.find("gpu_shader_common_") != std::string::npos ||
                            filename.find("gpu_shader_compositor_") != std::string::npos);
 
-  if (is_info) {
-    std::cerr << "File " << output_file_name
-              << " is a create info file and should not be processed as glsl" << std::endl;
-    return 1;
-  }
-
   using Preprocessor = blender::gpu::shader::Preprocessor;
   Preprocessor processor;
 
@@ -103,8 +107,14 @@ int main(int argc, char **argv)
   }
 
   blender::gpu::shader::metadata::Source metadata;
-  output_file << processor.process(
-      language, buffer.str(), input_file_name, is_library, is_shared, report_error, metadata);
+  if (is_info) {
+    /* Until they are parsed properly. Nullify them. */
+    output_file << "";
+  }
+  else {
+    output_file << processor.process(
+        language, buffer.str(), input_file_name, is_library, is_shared, report_error, metadata);
+  }
 
   /* TODO(fclem): Don't use regex for that. */
   std::string metadata_function_name = "metadata_" +
@@ -113,10 +123,17 @@ int main(int argc, char **argv)
   std::replace(metadata_function_name.begin(), metadata_function_name.end(), '.', '_');
 
   metadata_file << metadata.serialize(metadata_function_name);
+  if (is_info) {
+    /* Simple copy for now. But we need to rename all includes. */
+    std::string str = std::regex_replace(
+        buffer.str(), std::regex(R"(_infos.hh")"), "_infos.hh.info\"");
+    infos_file << str;
+  }
 
   input_file.close();
   output_file.close();
   metadata_file.close();
+  infos_file.close();
 
   return error;
 }
diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
index d3b9ba399a4..3cb07d0fca6 100644
--- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
+++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
@@ -720,7 +720,12 @@ class Preprocessor {
         parser.erase(tokens.front(), tokens.back());
         return;
       }
-      if (dependency_name.find("info.hh") != std::string::npos) {
+      if (dependency_name.find("infos.hh") != std::string::npos) {
+        /* Skip info files. They are only for IDE linting. */
+        parser.erase(tokens.front(), tokens.back());
+        return;
+      }
+      if (dependency_name.find("gpu_shader_create_info.hh") != std::string::npos) {
         /* Skip info files. They are only for IDE linting. */
         parser.erase(tokens.front(), tokens.back());
         return;
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index c0cb4703a75..7fa3711be30 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -526,7 +526,13 @@ void gpu_shader_create_info_init()
 #define GPU_SHADER_CREATE_END() ;
 
 /* Declare, register and construct the infos. */
-#include "gpu_shader_create_info_list.hh"
+#include "glsl_compositor_infos_list.hh"
+#include "glsl_draw_infos_list.hh"
+#include "glsl_gpu_infos_list.hh"
+#include "glsl_ocio_infos_list.hh"
+#ifdef WITH_OPENSUBDIV
+#  include "glsl_osd_infos_list.hh"
+#endif
 
   if (GPU_stencil_clasify_buffer_workaround()) {
     /* WORKAROUND: Adding a dummy buffer that isn't used fixes a bug inside the Qualcomm driver. */
diff --git a/source/blender/gpu/intern/gpu_shader_create_info_list.hh b/source/blender/gpu/intern/gpu_shader_create_info_list.hh
deleted file mode 100644
index b12f3a057be..00000000000
--- a/source/blender/gpu/intern/gpu_shader_create_info_list.hh
+++ /dev/null
@@ -1,186 +0,0 @@
-/* SPDX-FileCopyrightText: 2024 Blender Authors
- *
- * SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* GPU module. */
-#include "gpu_clip_planes_info.hh"
-#include "gpu_index_load_info.hh"
-#include "gpu_shader_2D_area_borders_info.hh"
-#include "gpu_shader_2D_checker_info.hh"
-#include "gpu_shader_2D_diag_stripes_info.hh"
-#include "gpu_shader_2D_image_desaturate_color_info.hh"
-#include "gpu_shader_2D_image_info.hh"
-#include "gpu_shader_2D_image_overlays_merge_info.hh"
-#include "gpu_shader_2D_image_overlays_stereo_merge_info.hh"
-#include "gpu_shader_2D_image_rect_color_info.hh"
-#include "gpu_shader_2D_image_shuffle_color_info.hh"
-#include "gpu_shader_2D_node_socket_info.hh"
-#include "gpu_shader_2D_nodelink_info.hh"
-#include "gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh"
-#include "gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh"
-#include "gpu_shader_2D_point_varying_size_varying_color_info.hh"
-#include "gpu_shader_2D_widget_info.hh"
-#include "gpu_shader_3D_depth_only_info.hh"
-#include "gpu_shader_3D_flat_color_info.hh"
-#include "gpu_shader_3D_image_info.hh"
-#include "gpu_shader_3D_point_info.hh"
-#include "gpu_shader_3D_polyline_info.hh"
-#include "gpu_shader_3D_smooth_color_info.hh"
-#include "gpu_shader_3D_uniform_color_info.hh"
-#include "gpu_shader_gpencil_stroke_info.hh"
-#include "gpu_shader_icon_info.hh"
-#include "gpu_shader_index_info.hh"
-#include "gpu_shader_keyframe_shape_info.hh"
-#include "gpu_shader_line_dashed_uniform_color_info.hh"
-#include "gpu_shader_print_info.hh"
-#include "gpu_shader_sequencer_info.hh"
-#include "gpu_shader_simple_lighting_info.hh"
-#include "gpu_shader_text_info.hh"
-#include "gpu_srgb_to_framebuffer_space_info.hh"
-
-#ifdef WITH_GTESTS
-#  ifdef WITH_GPU_BACKEND_TESTS
-#    include "gpu_shader_test_info.hh"
-#  endif
-#endif
-
-#ifdef WITH_METAL_BACKEND
-/* Metal */
-#  include "depth_2d_update_info.hh"
-#  include "gpu_shader_fullscreen_blit_info.hh"
-#endif
-
-#ifdef WITH_VULKAN_BACKEND
-#  include "vk_backbuffer_blit_info.hh"
-#endif
-
-/* Compositor. */
-#include "compositor_alpha_crop_info.hh"
-#include "compositor_bilateral_blur_info.hh"
-#include "compositor_bokeh_blur_info.hh"
-#include "compositor_bokeh_blur_variable_size_info.hh"
-#include "compositor_bokeh_image_info.hh"
-#include "compositor_box_mask_info.hh"
-#include "compositor_compute_preview_info.hh"
-#include "compositor_convert_info.hh"
-#include "compositor_cryptomatte_info.hh"
-#include "compositor_defocus_info.hh"
-#include "compositor_deriche_gaussian_blur_info.hh"
-#include "compositor_despeckle_info.hh"
-#include "compositor_directional_blur_info.hh"
-#include "compositor_displace_info.hh"
-#include "compositor_double_edge_mask_info.hh"
-#include "compositor_edge_filter_info.hh"
-#include "compositor_ellipse_mask_info.hh"
-#include "compositor_filter_info.hh"
-#include "compositor_flip_info.hh"
-#include "compositor_gamma_correct_info.hh"
-#include "compositor_glare_info.hh"
-#include "compositor_id_mask_info.hh"
-#include "compositor_image_coordinates_info.hh"
-#include "compositor_image_crop_info.hh"
-#include "compositor_inpaint_info.hh"
-#include "compositor_jump_flooding_info.hh"
-#include "compositor_keying_info.hh"
-#include "compositor_keying_screen_info.hh"
-#include "compositor_kuwahara_info.hh"
-#include "compositor_lens_distortion_info.hh"
-#include "compositor_map_uv_info.hh"
-#include "compositor_morphological_blur_info.hh"
-#include "compositor_morphological_distance_feather_info.hh"
-#include "compositor_morphological_distance_info.hh"
-#include "compositor_morphological_distance_threshold_info.hh"
-#include "compositor_morphological_step_info.hh"
-#include "compositor_motion_blur_info.hh"
-#include "compositor_movie_distortion_info.hh"
-#include "compositor_normalize_info.hh"
-#include "compositor_pad_info.hh"
-#include "compositor_parallel_reduction_info.hh"
-#include "compositor_pixelate_info.hh"
-#include "compositor_plane_deform_info.hh"
-#include "compositor_premultiply_alpha_info.hh"
-#include "compositor_read_input_info.hh"
-#include "compositor_realize_on_domain_info.hh"
-#include "compositor_sample_pixel_info.hh"
-#include "compositor_scale_variable_info.hh"
-#include "compositor_smaa_info.hh"
-#include "compositor_split_info.hh"
-#include "compositor_summed_area_table_info.hh"
-#include "compositor_symmetric_blur_info.hh"
-#include "compositor_symmetric_blur_variable_size_info.hh"
-#include "compositor_symmetric_separable_blur_info.hh"
-#include "compositor_symmetric_separable_blur_variable_size_info.hh"
-#include "compositor_tone_map_photoreceptor_info.hh"
-#include "compositor_tone_map_simple_info.hh"
-#include "compositor_translate_wrapped_info.hh"
-#include "compositor_van_vliet_gaussian_blur_info.hh"
-#include "compositor_write_output_info.hh"
-#include "compositor_z_combine_info.hh"
-
-/* DRW module. */
-#include "draw_curves_info.hh"
-#include "draw_debug_info.hh"
-#include "draw_object_infos_info.hh"
-#include "draw_view_info.hh"
-#include "gpu_shader_fullscreen_info.hh"
-#ifdef WITH_OPENSUBDIV
-#  include "subdiv_info.hh"
-#endif
-
-/* EEVEE engine. */
-#include "eevee_ambient_occlusion_info.hh"
-#include "eevee_common_info.hh"
-#include "eevee_deferred_info.hh"
-#include "eevee_depth_of_field_info.hh"
-#include "eevee_film_info.hh"
-#include "eevee_hiz_info.hh"
-#include "eevee_light_culling_info.hh"
-#include "eevee_lightprobe_sphere_info.hh"
-#include "eevee_lightprobe_volume_info.hh"
-#include "eevee_lookdev_info.hh"
-#include "eevee_lut_info.hh"
-#include "eevee_material_info.hh"
-#include "eevee_motion_blur_info.hh"
-#include "eevee_shadow_info.hh"
-#include "eevee_subsurface_info.hh"
-#include "eevee_tracing_info.hh"
-#include "eevee_velocity_info.hh"
-#include "eevee_volume_info.hh"
-
-/* Image engine. */
-#include "engine_image_info.hh"
-
-/* Grease Pencil engine. */
-#include "gpencil_info.hh"
-#include "gpencil_vfx_info.hh"
-
-/* Overlay engine. */
-#include "overlay_antialiasing_info.hh"
-#include "overlay_armature_info.hh"
-#include "overlay_background_info.hh"
-#include "overlay_common_info.hh"
-#include "overlay_edit_mode_info.hh"
-#include "overlay_extra_info.hh"
-#include "overlay_facing_info.hh"
-#include "overlay_grid_info.hh"
-#include "overlay_outline_info.hh"
-#include "overlay_paint_info.hh"
-#include "overlay_sculpt_curves_info.hh"
-#include "overlay_sculpt_info.hh"
-#include "overlay_viewer_attribute_info.hh"
-#include "overlay_volume_info.hh"
-#include "overlay_wireframe_info.hh"
-
-/* Selection engine. */
-#include "select_id_info.hh"
-
-/* Workbench engine. */
-#include "workbench_composite_info.hh"
-#include "workbench_depth_info.hh"
-#include "workbench_effect_antialiasing_info.hh"
-#include "workbench_effect_dof_info.hh"
-#include "workbench_effect_outline_info.hh"
-#include "workbench_prepass_info.hh"
-#include "workbench_shadow_info.hh"
-#include "workbench_transparent_resolve_info.hh"
-#include "workbench_volume_info.hh"
diff --git a/source/blender/gpu/metal/kernels/depth_2d_update_info.hh b/source/blender/gpu/metal/kernels/depth_2d_update_infos.hh
similarity index 100%
rename from source/blender/gpu/metal/kernels/depth_2d_update_info.hh
rename to source/blender/gpu/metal/kernels/depth_2d_update_infos.hh
diff --git a/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh b/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_infos.hh
similarity index 100%
rename from source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
rename to source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_infos.hh
diff --git a/source/blender/gpu/shaders/common/gpu_shader_fullscreen_vert.glsl b/source/blender/gpu/shaders/common/gpu_shader_fullscreen_vert.glsl
index f5181c3bc0e..6f0511da655 100644
--- a/source/blender/gpu/shaders/common/gpu_shader_fullscreen_vert.glsl
+++ b/source/blender/gpu/shaders/common/gpu_shader_fullscreen_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "gpu_shader_fullscreen_info.hh"
+#include "gpu_shader_fullscreen_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_fullscreen)
 
diff --git a/source/blender/gpu/shaders/common/gpu_shader_index_load_lib.glsl b/source/blender/gpu/shaders/common/gpu_shader_index_load_lib.glsl
index 23e53fae996..4c6ab143955 100644
--- a/source/blender/gpu/shaders/common/gpu_shader_index_load_lib.glsl
+++ b/source/blender/gpu/shaders/common/gpu_shader_index_load_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/gpu_index_load_info.hh"
+#include "infos/gpu_index_load_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(gpu_index_buffer_load)
 
diff --git a/source/blender/gpu/shaders/common/gpu_shader_print_lib.glsl b/source/blender/gpu/shaders/common/gpu_shader_print_lib.glsl
index bcd8de5d84a..3bc1dc5a441 100644
--- a/source/blender/gpu/shaders/common/gpu_shader_print_lib.glsl
+++ b/source/blender/gpu/shaders/common/gpu_shader_print_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/gpu_shader_print_info.hh"
+#include "infos/gpu_shader_print_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(gpu_print)
 
diff --git a/source/blender/gpu/shaders/common/gpu_shader_sequencer_lib.glsl b/source/blender/gpu/shaders/common/gpu_shader_sequencer_lib.glsl
index 88a33d18e33..226c3e5daa6 100644
--- a/source/blender/gpu/shaders/common/gpu_shader_sequencer_lib.glsl
+++ b/source/blender/gpu/shaders/common/gpu_shader_sequencer_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(gpu_shader_sequencer_strips)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl
index c0477d74f2b..6fb0ef06a4e 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_area_borders_info.hh"
+#include "infos/gpu_shader_2D_area_borders_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl
index cf8499c21af..5bc025347cb 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_area_borders_info.hh"
+#include "infos/gpu_shader_2D_area_borders_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
index 9827f9dc29f..d0609a46bf1 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
@@ -7,7 +7,7 @@
  * does not need any vertex input (producing less call to immBegin/End)
  */
 
-#include "infos/gpu_shader_2D_image_rect_color_info.hh"
+#include "infos/gpu_shader_2D_image_rect_color_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl
index d9597dc16e6..8a1e9fc140f 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_info.hh"
+#include "infos/gpu_shader_2D_image_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_common)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
index 192985bf25f..a444f6eab84 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
@@ -9,7 +9,7 @@
  * Dashed is performed in screen space.
  */
 
-#include "infos/gpu_shader_line_dashed_uniform_color_info.hh"
+#include "infos/gpu_shader_line_dashed_uniform_color_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_3D_line_dashed_uniform_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_node_socket_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_node_socket_frag.glsl
index ee811b95c92..11e67a3fc85 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_node_socket_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_node_socket_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_node_socket_info.hh"
+#include "infos/gpu_shader_2D_node_socket_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_node_socket_inst)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_node_socket_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_node_socket_vert.glsl
index d0da499240e..2486f5a26ef 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_node_socket_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_node_socket_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_node_socket_info.hh"
+#include "infos/gpu_shader_2D_node_socket_infos.hh"
 
 #include "gpu_shader_math_base_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
index 8401be5848a..556beabfd47 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_nodelink_info.hh"
+#include "infos/gpu_shader_2D_nodelink_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_nodelink)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
index e1f3022443a..0ceff5e5bcd 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
@@ -12,7 +12,7 @@
  * `pos` is the verts position in the curve tangent space
  */
 
-#include "infos/gpu_shader_2D_nodelink_info.hh"
+#include "infos/gpu_shader_2D_nodelink_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_nodelink)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
index 19a5556f182..146ad04afb6 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh"
+#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
index cf46293503a..ea026563600 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh"
+#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl
index 1a9cf467aa7..b6daf3528f4 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_varying_size_varying_color_info.hh"
+#include "infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_vert.glsl
index 50db1cf8180..c3dac9a7a30 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_checker_info.hh"
+#include "infos/gpu_shader_2D_checker_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_checker)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
index e4bb2afb178..86d3654b947 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_widget_info.hh"
+#include "infos/gpu_shader_2D_widget_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
index 63d25bd57f1..d10ba77e631 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_widget_info.hh"
+#include "infos/gpu_shader_2D_widget_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_base)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
index cdb6ccb215b..d37c68dce46 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_widget_info.hh"
+#include "infos/gpu_shader_2D_widget_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
index c335b503c36..e378cfda648 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_widget_info.hh"
+#include "infos/gpu_shader_2D_widget_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl
index 74ead7fb851..1ef873bb3ee 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_uniform_color_info.hh"
+#include "infos/gpu_shader_3D_uniform_color_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_clipped_uniform_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
index 2d2ed268464..54a458821a3 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_flat_color_info.hh"
+#include "infos/gpu_shader_3D_flat_color_infos.hh"
 
 #include "gpu_shader_cfg_world_clip_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl
index a6370e5df82..6e1c308dab3 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_image_info.hh"
+#include "infos/gpu_shader_3D_image_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_image_common)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl
index 731c35771b5..9b074af5599 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl
@@ -9,7 +9,7 @@
  * Dashed is performed in screen space.
  */
 
-#include "infos/gpu_shader_line_dashed_uniform_color_info.hh"
+#include "infos/gpu_shader_line_dashed_uniform_color_infos.hh"
 
 #include "gpu_shader_cfg_world_clip_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl
index f492c8d213c..5b531624d3f 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_simple_lighting_info.hh"
+#include "infos/gpu_shader_simple_lighting_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_simple_lighting)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_point_flat_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_point_flat_color_vert.glsl
index 5577271e194..316b1b9abc4 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_point_flat_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_point_flat_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_point_info.hh"
+#include "infos/gpu_shader_3D_point_infos.hh"
 
 #include "gpu_shader_cfg_world_clip_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
index 6d340a0538f..afc0ee8b79a 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_point_info.hh"
+#include "infos/gpu_shader_3D_point_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl
index b5085de94b1..bf405e50700 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_point_info.hh"
+#include "infos/gpu_shader_3D_point_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_varying_size_varying_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl b/source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl
index 4db8cc54059..75279261b3e 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_polyline_info.hh"
+#include "infos/gpu_shader_3D_polyline_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl
index 688ebec57c3..3a16e335a1f 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_polyline_info.hh"
+#include "infos/gpu_shader_3D_polyline_infos.hh"
 
 #include "gpu_shader_attribute_load_lib.glsl"
 #include "gpu_shader_index_load_lib.glsl"
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl
index 3a566e3e824..9a8bfee4db9 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_smooth_color_info.hh"
+#include "infos/gpu_shader_3D_smooth_color_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
index 4d7988cf674..b1f03b20fa1 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_smooth_color_info.hh"
+#include "infos/gpu_shader_3D_smooth_color_infos.hh"
 
 #include "gpu_shader_cfg_world_clip_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
index 8666d45ccc3..0d4f1f631e2 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_depth_only_info.hh"
+#include "infos/gpu_shader_3D_depth_only_infos.hh"
 
 #include "gpu_shader_cfg_world_clip_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl b/source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl
index 11fc1d74690..db0f0291e34 100644
--- a/source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/gpu_clip_planes_info.hh"
+#include "infos/gpu_clip_planes_infos.hh"
 
 #ifdef GPU_FRAGMENT_SHADER
 #  error File should not be included in fragment shader
diff --git a/source/blender/gpu/shaders/gpu_shader_checker_frag.glsl b/source/blender/gpu/shaders/gpu_shader_checker_frag.glsl
index f3e32349422..29a0b0dde1f 100644
--- a/source/blender/gpu/shaders/gpu_shader_checker_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_checker_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_checker_info.hh"
+#include "infos/gpu_shader_2D_checker_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_checker)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl b/source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl
index e500613dee6..1174ca40514 100644
--- a/source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "infos/gpu_srgb_to_framebuffer_space_info.hh"
+#include "infos/gpu_srgb_to_framebuffer_space_infos.hh"
 
 SHADER_LIBRARY_CREATE_INFO(gpu_srgb_to_framebuffer_space)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl b/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
index 7f0506399ee..9a48874fd79 100644
--- a/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_depth_only_info.hh"
+#include "infos/gpu_shader_3D_depth_only_infos.hh"
 
 void main()
 {
diff --git a/source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl b/source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
index 72927b8940d..5b2f6b11496 100644
--- a/source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_diag_stripes_info.hh"
+#include "infos/gpu_shader_2D_diag_stripes_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_display_fallback_frag.glsl b/source/blender/gpu/shaders/gpu_shader_display_fallback_frag.glsl
index 17284154be4..f268fc45550 100644
--- a/source/blender/gpu/shaders/gpu_shader_display_fallback_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_display_fallback_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_overlays_merge_info.hh"
+#include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_display_fallback_vert.glsl b/source/blender/gpu/shaders/gpu_shader_display_fallback_vert.glsl
index 78e920b7df8..6193949588a 100644
--- a/source/blender/gpu/shaders/gpu_shader_display_fallback_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_display_fallback_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_overlays_merge_info.hh"
+#include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl
index 1612f249af0..daf199b7c50 100644
--- a/source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_flat_color_info.hh"
+#include "infos/gpu_shader_3D_flat_color_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
index 863e3c347b4..5b0b8790c4e 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_gpencil_stroke_info.hh"
+#include "infos/gpu_shader_gpencil_stroke_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
index 30ce9cefbe0..89021c57da1 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_gpencil_stroke_info.hh"
+#include "infos/gpu_shader_gpencil_stroke_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_icon_frag.glsl b/source/blender/gpu/shaders/gpu_shader_icon_frag.glsl
index eadf2fb807f..d57fae8e4c0 100644
--- a/source/blender/gpu/shaders/gpu_shader_icon_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_icon_frag.glsl
@@ -10,7 +10,7 @@
  * the rounded corner, and the rectangle sides.
  */
 
-#include "infos/gpu_shader_icon_info.hh"
+#include "infos/gpu_shader_icon_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_icon)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_icon_multi_vert.glsl b/source/blender/gpu/shaders/gpu_shader_icon_multi_vert.glsl
index 71233a0bd7b..ba11f6545e1 100644
--- a/source/blender/gpu/shaders/gpu_shader_icon_multi_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_icon_multi_vert.glsl
@@ -7,7 +7,7 @@
  * does not need any vertex input (producing less call to immBegin/End)
  */
 
-#include "infos/gpu_shader_icon_info.hh"
+#include "infos/gpu_shader_icon_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_icon_multi)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_icon_vert.glsl b/source/blender/gpu/shaders/gpu_shader_icon_vert.glsl
index 6ab586a4d4c..46d4e0810d7 100644
--- a/source/blender/gpu/shaders/gpu_shader_icon_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_icon_vert.glsl
@@ -7,7 +7,7 @@
  * does not need any vertex input (producing less call to immBegin/End)
  */
 
-#include "infos/gpu_shader_icon_info.hh"
+#include "infos/gpu_shader_icon_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_icon)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl
index 69c946eb121..adb9e0a02d3 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_rect_color_info.hh"
+#include "infos/gpu_shader_2D_image_rect_color_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl
index 28e68564e74..54105461f9b 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_desaturate_color_info.hh"
+#include "infos/gpu_shader_2D_image_desaturate_color_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_desaturate_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_frag.glsl
index fdef13a437b..8f181c2ddbf 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_info.hh"
+#include "infos/gpu_shader_2D_image_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_common)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
index 9aeda408e46..f7f197435cc 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
@@ -4,7 +4,7 @@
 
 /* Merge overlays texture on top of image texture and transform to display space (assume sRGB) */
 
-#include "infos/gpu_shader_2D_image_overlays_merge_info.hh"
+#include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl
index e27efd89692..5cfbdf60293 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh"
+#include "infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_stereo_merge)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
index 48f0417a310..dc8782a5c6c 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_image_shuffle_color_info.hh"
+#include "infos/gpu_shader_2D_image_shuffle_color_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_shuffle_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_index_2d_array_lines.glsl b/source/blender/gpu/shaders/gpu_shader_index_2d_array_lines.glsl
index 0948375b4a4..9376d5b8022 100644
--- a/source/blender/gpu/shaders/gpu_shader_index_2d_array_lines.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_index_2d_array_lines.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_index_info.hh"
+#include "infos/gpu_shader_index_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_lines)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_index_2d_array_points.glsl b/source/blender/gpu/shaders/gpu_shader_index_2d_array_points.glsl
index c95512c6b69..5c3e45bd694 100644
--- a/source/blender/gpu/shaders/gpu_shader_index_2d_array_points.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_index_2d_array_points.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_index_info.hh"
+#include "infos/gpu_shader_index_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_index_2d_array_tris.glsl b/source/blender/gpu/shaders/gpu_shader_index_2d_array_tris.glsl
index d1dd251c67c..941e76948fe 100644
--- a/source/blender/gpu/shaders/gpu_shader_index_2d_array_tris.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_index_2d_array_tris.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_index_info.hh"
+#include "infos/gpu_shader_index_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_tris)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl b/source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl
index 673f837b62f..47dd30bf618 100644
--- a/source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_keyframe_shape_info.hh"
+#include "infos/gpu_shader_keyframe_shape_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_keyframe_shape)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl b/source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl
index ee264152964..4405121f666 100644
--- a/source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_keyframe_shape_info.hh"
+#include "infos/gpu_shader_keyframe_shape_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_keyframe_shape)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl b/source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
index e9020b6bf96..bab3e6900f9 100644
--- a/source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh"
+#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl b/source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
index 4d75fef4fde..e59a67b559c 100644
--- a/source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh"
+#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
index a2fa9ef096c..97970149e00 100644
--- a/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_2D_point_varying_size_varying_color_info.hh"
+#include "infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_scope_comp.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_scope_comp.glsl
index e176fadca3c..3a56a5dca36 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_scope_comp.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_scope_comp.glsl
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "gpu_shader_common_color_utils.glsl"
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_raster)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_scope_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_scope_frag.glsl
index 61e483fa72b..f9eb96dfcfa 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_scope_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_scope_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_resolve)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
index c8e7f37233e..12ac968c952 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 #include "gpu_shader_sequencer_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_vert.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_vert.glsl
index 38ffa718159..6b137c9b240 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_strips)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_frag.glsl
index 39d82836486..8df33577342 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 #include "gpu_shader_sequencer_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_vert.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_vert.glsl
index 09075eb57c9..93145415f1c 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_thumbs)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_zebra_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_zebra_frag.glsl
index b9c5fdec31e..8346c36cc69 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_zebra_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_zebra_frag.glsl
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "gpu_shader_common_color_utils.glsl"
-#include "infos/gpu_shader_sequencer_info.hh"
+#include "infos/gpu_shader_sequencer_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_zebra)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl b/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
index 31108c720a6..866fb8d4bc1 100644
--- a/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_simple_lighting_info.hh"
+#include "infos/gpu_shader_simple_lighting_infos.hh"
 
 FRAGMENT_SHADER_CREATE_INFO(gpu_shader_simple_lighting)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
index 562dff4d9c5..881d4283643 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_text_info.hh"
+#include "infos/gpu_shader_text_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
index 087acb47765..3f1735d4f5e 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_text_info.hh"
+#include "infos/gpu_shader_text_infos.hh"
 
 VERTEX_SHADER_CREATE_INFO(gpu_shader_text)
 
diff --git a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
index b912d706f41..ec73ff9f393 100644
--- a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "infos/gpu_shader_3D_uniform_color_info.hh"
+#include "infos/gpu_shader_3D_uniform_color_infos.hh"
 
 #include "gpu_shader_colorspace_lib.glsl"
 
diff --git a/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh b/source/blender/gpu/shaders/infos/gpu_clip_planes_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh
rename to source/blender/gpu/shaders/infos/gpu_clip_planes_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_index_load_info.hh b/source/blender/gpu/shaders/infos/gpu_index_load_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_index_load_info.hh
rename to source/blender/gpu/shaders/infos/gpu_index_load_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_interface_info.hh b/source/blender/gpu/shaders/infos/gpu_interface_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_interface_info.hh
rename to source/blender/gpu/shaders/infos/gpu_interface_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_checker_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
similarity index 92%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
index 6bedc085753..0190606960a 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
@@ -11,7 +11,7 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_shader_2D_image_info.hh"
+#  include "gpu_shader_2D_image_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_infos.hh
similarity index 88%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_infos.hh
index 28efb59cffb..0f0bef1df3a 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_infos.hh
@@ -12,10 +12,10 @@
 
 #  include "GPU_shader_shared.hh"
 
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_common)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
similarity index 97%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
index 891ce5f299f..837dbcbe748 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
similarity index 90%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
index d5f3e48eeed..ef9a98aa230 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
@@ -12,10 +12,10 @@
 
 #  include "GPU_shader_shared.hh"
 
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
similarity index 92%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
index 49829af9c25..b766ab8ae7c 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
@@ -11,7 +11,7 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_shader_2D_image_info.hh"
+#  include "gpu_shader_2D_image_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
similarity index 89%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
index 283c7af9ebb..26c85e8c9a4 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
@@ -11,10 +11,10 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
similarity index 96%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
index 0baadc8c756..d9931560138 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
similarity index 95%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
index 259556f2825..db0b62ef4c3 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_widget_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_widget_infos.hh
similarity index 96%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_widget_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_widget_infos.hh
index 8f70c1be329..c4ff4680fe6 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_widget_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_widget_infos.hh
@@ -11,12 +11,12 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 
 #  define widgetID 0
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_INTERFACE_INFO(gpu_widget_iface)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_infos.hh
similarity index 91%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_infos.hh
index bea44ca13c2..54a34779a0d 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_infos.hh
@@ -11,10 +11,10 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
+#  include "gpu_clip_planes_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_infos.hh
similarity index 87%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_infos.hh
index 1e3480c9a9a..bd05c466f1f 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_infos.hh
@@ -11,11 +11,11 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_clip_planes_infos.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_image_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_infos.hh
similarity index 92%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_image_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_image_infos.hh
index 0366ca3fc78..3e48e39da9f 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_image_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_infos.hh
@@ -12,10 +12,10 @@
 
 #  include "GPU_shader_shared.hh"
 
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_3D_image_common)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_infos.hh
similarity index 94%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_point_infos.hh
index eb293e44ece..7b2d7e2fe06 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_infos.hh
@@ -11,9 +11,9 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
-#  include "gpu_interface_info.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_clip_planes_infos.hh"
+#  include "gpu_interface_infos.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_infos.hh
similarity index 95%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_infos.hh
index 336d4d88892..19a68bc7016 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_infos.hh
@@ -11,12 +11,12 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_index_load_info.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_index_load_infos.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #  define SMOOTH_WIDTH 1.0f
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_INTERFACE_INFO(gpu_shader_3D_polyline_iface)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_infos.hh
similarity index 87%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_infos.hh
index 9ecd391257c..4b80a3aaf1e 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_infos.hh
@@ -11,11 +11,11 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_clip_planes_infos.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_infos.hh
similarity index 94%
rename from source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_infos.hh
index e4d29d261f2..194f94c9d24 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_infos.hh
@@ -11,8 +11,8 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_clip_planes_infos.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_fullscreen_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_fullscreen_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_fullscreen_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_fullscreen_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_icon_infos.hh
similarity index 97%
rename from source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_icon_infos.hh
index e3d948eece0..02ed4bcf6da 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_icon_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_icon_shared)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_index_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_index_infos.hh
similarity index 97%
rename from source/blender/gpu/shaders/infos/gpu_shader_index_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_index_infos.hh
index 6fd9d617dcb..c4f0a2c67cb 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_index_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_index_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
similarity index 95%
rename from source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
index f740945a660..bd11013da7f 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
@@ -11,10 +11,10 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_clip_planes_info.hh"
+#  include "gpu_clip_planes_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 /* We leverage hardware interpolation to compute distance along the line. */
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_print_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_print_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_print_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_print_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_sequencer_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_sequencer_infos.hh
similarity index 97%
rename from source/blender/gpu/shaders/infos/gpu_shader_sequencer_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_sequencer_infos.hh
index 7ba8c1c54f4..3a8950da32c 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_sequencer_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_sequencer_infos.hh
@@ -11,10 +11,10 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_shader_fullscreen_info.hh"
+#  include "gpu_shader_fullscreen_infos.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_INTERFACE_INFO(gpu_seq_strip_iface)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_infos.hh
similarity index 100%
rename from source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_infos.hh
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_test_infos.hh
similarity index 99%
rename from source/blender/gpu/shaders/infos/gpu_shader_test_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_test_infos.hh
index 7c6e1213375..75abfc44410 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_test_infos.hh
@@ -13,7 +13,7 @@
 #  include "GPU_shader_shared.hh"
 #endif
 
-#include "gpu_interface_info.hh"
+#include "gpu_interface_infos.hh"
 #include "gpu_shader_create_info.hh"
 
 GPU_SHADER_CREATE_INFO(gpu_shader_test)
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_text_infos.hh
similarity index 95%
rename from source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_text_infos.hh
index ce015ea3cbe..1b5fa5c3ac3 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_text_infos.hh
@@ -11,7 +11,7 @@
 #  include "gpu_shader_compat.hh"
 
 #  include "GPU_shader_shared.hh"
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_info.hh b/source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
similarity index 88%
rename from source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_info.hh
rename to source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
index 5777e29d88b..8f7177e2c58 100644
--- a/source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
@@ -10,7 +10,7 @@
 #  pragma once
 #  include "gpu_shader_compat.hh"
 
-#  include "gpu_srgb_to_framebuffer_space_info.hh"
+#  include "gpu_srgb_to_framebuffer_space_infos.hh"
 #endif
 
 #include "gpu_shader_create_info.hh"
diff --git a/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_comp.glsl b/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_comp.glsl
index 6dfe5a6e5fa..a7a8428dbb5 100644
--- a/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_comp.glsl
+++ b/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_comp.glsl
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "vk_backbuffer_blit_info.hh"
+#include "vk_backbuffer_blit_infos.hh"
 
 COMPUTE_SHADER_CREATE_INFO(vk_backbuffer_blit)
 
diff --git a/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_info.hh b/source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_infos.hh
similarity index 100%
rename from source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_info.hh
rename to source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_infos.hh
diff --git a/source/blender/imbuf/opencolorio/CMakeLists.txt b/source/blender/imbuf/opencolorio/CMakeLists.txt
index 0ee66842103..bd188822097 100644
--- a/source/blender/imbuf/opencolorio/CMakeLists.txt
+++ b/source/blender/imbuf/opencolorio/CMakeLists.txt
@@ -109,11 +109,13 @@ target_link_libraries(bf_imbuf_opencolorio PRIVATE bf_imbuf_opencolorio_shaders)
 
 set(GLSL_SOURCE_CONTENT "")
 set(GLSL_METADATA_CONTENT "")
+set(GLSL_INFOS_CONTENT "")
 foreach(GLSL_FILE ${GLSL_SRC})
   get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
   string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
   string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
   string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
+  string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
 endforeach()
 
 set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_source_list.h")
@@ -122,6 +124,9 @@ list(APPEND SRC ${glsl_source_list_file})
 set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_metadata_list.hh")
 file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
 list(APPEND SRC ${glsl_metadata_list_file})
+set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_infos_list.hh")
+file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
+list(APPEND SRC ${glsl_infos_list_file})
 list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_include_directories(bf_imbuf_opencolorio_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})