From 81ee13006313d5d71733037a86d66fc9e60dc8ec Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Sat, 22 Jul 2023 11:27:25 +1000
Subject: [PATCH] Cleanup: use C++ system headers

Apply clang-tidy modernize-deprecated-headers to source/
---
 source/blender/blenfont/intern/blf.cc            |  8 ++++----
 source/blender/blenfont/intern/blf_dir.cc        |  6 +++---
 source/blender/blenfont/intern/blf_font.cc       |  8 ++++----
 .../blender/blenfont/intern/blf_font_default.cc  |  2 +-
 source/blender/blenfont/intern/blf_glyph.cc      |  8 ++++----
 source/blender/blenfont/intern/blf_thumbs.cc     |  2 +-
 source/blender/blenfont/intern/blf_util.cc       |  6 +++---
 source/blender/blenkernel/intern/CCGSubSurf.cc   |  6 +++---
 .../blender/blenkernel/intern/CCGSubSurf_util.cc |  6 +++---
 source/blender/blenkernel/intern/action.cc       |  8 ++++----
 .../blender/blenkernel/intern/action_mirror.cc   |  4 ++--
 source/blender/blenkernel/intern/addon.cc        |  4 ++--
 source/blender/blenkernel/intern/anim_data.cc    |  2 +-
 source/blender/blenkernel/intern/anim_path.cc    |  2 +-
 source/blender/blenkernel/intern/anim_sys.cc     | 10 +++++-----
 source/blender/blenkernel/intern/appdir.cc       |  6 +++---
 source/blender/blenkernel/intern/armature.cc     | 12 ++++++------
 .../blender/blenkernel/intern/armature_deform.cc | 12 ++++++------
 source/blender/blenkernel/intern/autoexec.cc     |  4 ++--
 source/blender/blenkernel/intern/blender.cc      |  6 +++---
 .../blenkernel/intern/blender_copybuffer.cc      |  2 +-
 source/blender/blenkernel/intern/blender_undo.cc | 10 +++++-----
 .../blenkernel/intern/blender_user_menu.cc       |  2 +-
 source/blender/blenkernel/intern/blendfile.cc    |  4 ++--
 .../blenkernel/intern/blendfile_link_append.cc   |  4 ++--
 source/blender/blenkernel/intern/boids.cc        |  4 ++--
 source/blender/blenkernel/intern/bpath.cc        |  2 +-
 source/blender/blenkernel/intern/cachefile.cc    |  2 +-
 source/blender/blenkernel/intern/camera.cc       |  4 ++--
 source/blender/blenkernel/intern/collection.cc   |  2 +-
 source/blender/blenkernel/intern/colortools.cc   |  8 ++++----
 source/blender/blenkernel/intern/constraint.cc   | 10 +++++-----
 source/blender/blenkernel/intern/curve_bevel.cc  |  2 +-
 source/blender/blenkernel/intern/curve_deform.cc |  8 ++++----
 .../blender/blenkernel/intern/customdata_file.cc |  6 +++---
 source/blender/blenkernel/intern/dynamicpaint.cc |  4 ++--
 source/blender/blenkernel/intern/effect.cc       |  8 ++++----
 source/blender/blenkernel/intern/fcurve.cc       | 10 +++++-----
 source/blender/blenkernel/intern/fcurve_cache.cc |  4 ++--
 source/blender/blenkernel/intern/fmodifier.cc    | 10 +++++-----
 .../blenkernel/intern/gpencil_curve_legacy.cc    | 10 +++++-----
 .../blender/blenkernel/intern/gpencil_legacy.cc  | 10 +++++-----
 .../blenkernel/intern/gpencil_modifier_legacy.cc |  2 +-
 .../intern/gpencil_update_cache_legacy.cc        |  2 +-
 source/blender/blenkernel/intern/idprop.cc       | 10 +++++-----
 source/blender/blenkernel/intern/idprop_utils.cc |  4 ++--
 source/blender/blenkernel/intern/idtype.cc       |  2 +-
 source/blender/blenkernel/intern/image_gen.cc    |  4 ++--
 source/blender/blenkernel/intern/ipo.cc          |  8 ++++----
 source/blender/blenkernel/intern/keyconfig.cc    |  6 +++---
 source/blender/blenkernel/intern/lattice.cc      |  8 ++++----
 .../blender/blenkernel/intern/lattice_deform.cc  |  8 ++++----
 source/blender/blenkernel/intern/layer_utils.cc  |  2 +-
 source/blender/blenkernel/intern/lib_id.cc       | 10 +++++-----
 source/blender/blenkernel/intern/lib_query.cc    |  2 +-
 source/blender/blenkernel/intern/light.cc        |  2 +-
 source/blender/blenkernel/intern/lightprobe.cc   |  2 +-
 source/blender/blenkernel/intern/main.cc         |  2 +-
 source/blender/blenkernel/intern/main_idmap.cc   |  4 ++--
 source/blender/blenkernel/intern/mask.cc         |  4 ++--
 .../blender/blenkernel/intern/mask_evaluate.cc   |  4 ++--
 source/blender/blenkernel/intern/movieclip.cc    |  6 +++---
 source/blender/blenkernel/intern/nla.cc          | 12 ++++++------
 .../blender/blenkernel/intern/object_deform.cc   |  4 ++--
 source/blender/blenkernel/intern/ocean.cc        |  6 +++---
 source/blender/blenkernel/intern/packedFile.cc   |  4 ++--
 .../blender/blenkernel/intern/paint_toolslots.cc |  2 +-
 .../blenkernel/intern/particle_distribute.cc     |  2 +-
 .../blender/blenkernel/intern/particle_system.cc |  8 ++++----
 source/blender/blenkernel/intern/pointcache.cc   |  6 +++---
 source/blender/blenkernel/intern/preferences.cc  |  2 +-
 source/blender/blenkernel/intern/report.cc       |  8 ++++----
 source/blender/blenkernel/intern/rigidbody.cc    | 12 ++++++------
 source/blender/blenkernel/intern/screen.cc       |  6 +++---
 source/blender/blenkernel/intern/shader_fx.cc    |  2 +-
 source/blender/blenkernel/intern/sound.cc        |  4 ++--
 .../blender/blenkernel/intern/subdiv_deform.cc   |  2 +-
 source/blender/blenkernel/intern/subdiv_stats.cc |  2 +-
 source/blender/blenkernel/intern/text.cc         |  6 +++---
 .../blenkernel/intern/text_suggestions.cc        |  8 ++++----
 source/blender/blenkernel/intern/tracking.cc     |  6 +++---
 .../blender/blenkernel/intern/tracking_auto.cc   |  2 +-
 .../blender/blenkernel/intern/tracking_solver.cc |  2 +-
 .../blenkernel/intern/tracking_stabilize.cc      |  2 +-
 .../blender/blenkernel/intern/tracking_util.cc   |  2 +-
 source/blender/blenkernel/intern/undo_system.cc  |  4 ++--
 source/blender/blenkernel/intern/unit.cc         |  8 ++++----
 source/blender/blenkernel/intern/vfont.cc        | 10 +++++-----
 source/blender/blenkernel/intern/world.cc        |  6 +++---
 source/blender/blenkernel/intern/writeavi.cc     |  2 +-
 .../blender/blenloader/intern/versioning_280.cc  |  4 ++--
 .../blender/blentranslation/intern/blt_lang.cc   |  8 ++++----
 .../blentranslation/intern/blt_translation.cc    |  4 ++--
 source/blender/blentranslation/msgfmt/msgfmt.cc  |  4 ++--
 .../editors/animation/anim_channels_defines.cc   |  2 +-
 .../editors/animation/anim_channels_edit.cc      |  6 +++---
 source/blender/editors/animation/anim_deps.cc    |  2 +-
 source/blender/editors/animation/anim_filter.cc  |  2 +-
 source/blender/editors/animation/anim_markers.cc |  2 +-
 .../editors/animation/anim_motion_paths.cc       |  2 +-
 source/blender/editors/animation/anim_ops.cc     |  4 ++--
 source/blender/editors/animation/drivers.cc      |  6 +++---
 source/blender/editors/animation/fmodifier_ui.cc |  2 +-
 .../blender/editors/animation/keyframes_draw.cc  |  2 +-
 .../blender/editors/animation/keyframes_edit.cc  |  8 ++++----
 .../editors/animation/keyframes_general.cc       |  8 ++++----
 source/blender/editors/animation/keyframing.cc   | 10 +++++-----
 source/blender/editors/animation/keyingsets.cc   | 10 +++++-----
 .../blender/editors/armature/armature_naming.cc  |  2 +-
 source/blender/editors/armature/pose_group.cc    |  2 +-
 source/blender/editors/armature/pose_lib_2.cc    |  4 ++--
 source/blender/editors/armature/pose_select.cc   |  2 +-
 source/blender/editors/curve/curve_ops.cc        |  4 ++--
 source/blender/editors/curve/editcurve_pen.cc    |  2 +-
 source/blender/editors/curve/editfont.cc         |  8 ++++----
 source/blender/editors/curve/editfont_undo.cc    |  4 ++--
 .../editors/gpencil_legacy/annotate_draw.cc      | 12 ++++++------
 .../editors/gpencil_legacy/annotate_paint.cc     | 10 +++++-----
 .../editors/gpencil_legacy/gpencil_undo.cc       |  4 ++--
 .../editors/lattice/editlattice_select.cc        |  2 +-
 .../blender/editors/lattice/editlattice_undo.cc  |  6 +++---
 source/blender/editors/mask/mask_editaction.cc   | 10 +++++-----
 source/blender/editors/mask/mask_shapekey.cc     |  2 +-
 .../blender/editors/metaball/editmball_undo.cc   |  4 ++--
 source/blender/editors/metaball/mball_edit.cc    |  4 ++--
 .../blender/editors/object/object_collection.cc  |  2 +-
 .../blender/editors/object/object_constraint.cc  |  4 ++--
 source/blender/editors/object/object_edit.cc     | 14 +++++++-------
 .../editors/object/object_gpencil_modifier.cc    |  8 ++++----
 source/blender/editors/object/object_hook.cc     |  4 ++--
 source/blender/editors/object/object_ops.cc      |  4 ++--
 .../blender/editors/object/object_relations.cc   |  6 +++---
 source/blender/editors/object/object_select.cc   |  8 ++++----
 .../blender/editors/object/object_shader_fx.cc   |  8 ++++----
 source/blender/editors/object/object_shapekey.cc |  4 ++--
 source/blender/editors/object/object_utils.cc    |  4 ++--
 source/blender/editors/object/object_volume.cc   |  2 +-
 .../blender/editors/physics/dynamicpaint_ops.cc  |  6 +++---
 source/blender/editors/physics/particle_boids.cc |  2 +-
 source/blender/editors/physics/particle_edit.cc  |  6 +++---
 .../editors/physics/particle_edit_undo.cc        |  6 +++---
 .../blender/editors/physics/particle_object.cc   |  4 ++--
 source/blender/editors/physics/physics_fluid.cc  |  6 +++---
 source/blender/editors/physics/physics_ops.cc    |  2 +-
 .../editors/physics/physics_pointcache.cc        |  4 ++--
 .../editors/physics/rigidbody_constraint.cc      |  4 ++--
 .../blender/editors/physics/rigidbody_object.cc  |  4 ++--
 .../blender/editors/physics/rigidbody_world.cc   |  4 ++--
 source/blender/editors/scene/scene_edit.cc       |  4 ++--
 source/blender/editors/screen/area.cc            |  4 ++--
 source/blender/editors/screen/glutil.cc          |  4 ++--
 source/blender/editors/screen/screen_context.cc  |  6 +++---
 source/blender/editors/screen/screen_edit.cc     |  4 ++--
 source/blender/editors/screen/screen_ops.cc      |  4 ++--
 .../blender/editors/screen/screen_user_menu.cc   |  8 ++++----
 source/blender/editors/screen/screendump.cc      |  4 ++--
 source/blender/editors/screen/workspace_edit.cc  |  4 ++--
 .../editors/screen/workspace_layout_edit.cc      |  2 +-
 .../blender/editors/sculpt_paint/sculpt_undo.cc  |  2 +-
 source/blender/editors/sound/sound_ops.cc        |  8 ++++----
 .../editors/space_buttons/buttons_context.cc     |  4 ++--
 .../blender/editors/space_buttons/buttons_ops.cc |  4 ++--
 .../editors/space_buttons/space_buttons.cc       |  4 ++--
 .../blender/editors/space_clip/clip_buttons.cc   |  4 ++--
 source/blender/editors/space_clip/clip_editor.cc |  4 ++--
 source/blender/editors/space_clip/clip_ops.cc    |  2 +-
 source/blender/editors/space_clip/space_clip.cc  |  4 ++--
 source/blender/editors/space_file/file_ops.cc    | 10 +++++-----
 source/blender/editors/space_file/file_panels.cc |  2 +-
 source/blender/editors/space_file/space_file.cc  |  4 ++--
 .../blender/editors/space_graph/graph_buttons.cc |  8 ++++----
 source/blender/editors/space_graph/graph_draw.cc |  8 ++++----
 source/blender/editors/space_graph/graph_edit.cc |  8 ++++----
 source/blender/editors/space_graph/graph_ops.cc  |  4 ++--
 .../blender/editors/space_graph/graph_select.cc  |  8 ++++----
 .../editors/space_graph/graph_slider_ops.cc      |  4 ++--
 .../blender/editors/space_graph/graph_utils.cc   |  8 ++++----
 source/blender/editors/space_graph/graph_view.cc |  2 +-
 .../blender/editors/space_graph/space_graph.cc   |  4 ++--
 .../blender/editors/space_image/image_buttons.cc |  4 ++--
 source/blender/editors/space_image/image_draw.cc |  6 +++---
 source/blender/editors/space_image/image_ops.cc  |  8 ++++----
 .../editors/space_image/image_sequence.cc        |  2 +-
 .../blender/editors/space_script/script_edit.cc  |  4 ++--
 .../blender/editors/space_script/script_ops.cc   |  4 ++--
 .../blender/editors/space_script/space_script.cc |  4 ++--
 .../editors/space_sequencer/sequencer_add.cc     |  2 +-
 .../editors/space_statusbar/space_statusbar.cc   |  4 ++--
 source/blender/editors/space_text/space_text.cc  |  2 +-
 .../editors/space_text/text_autocomplete.cc      |  4 ++--
 .../blender/editors/space_topbar/space_topbar.cc |  4 ++--
 .../editors/space_userpref/space_userpref.cc     |  4 ++--
 .../editors/space_userpref/userpref_ops.cc       |  2 +-
 .../editors/space_view3d/view3d_buttons.cc       |  8 ++++----
 .../editors/space_view3d/view3d_header.cc        |  6 +++---
 .../blender/editors/space_view3d/view3d_utils.cc |  8 ++++----
 source/blender/editors/transform/transform.cc    |  2 +-
 .../editors/transform/transform_constraints.cc   |  8 ++++----
 .../editors/transform/transform_convert_nla.cc   |  2 +-
 .../editors/transform/transform_generics.cc      |  2 +-
 .../blender/editors/transform/transform_input.cc |  4 ++--
 .../blender/editors/transform/transform_mode.cc  |  2 +-
 .../editors/transform/transform_mode_align.cc    |  2 +-
 .../editors/transform/transform_mode_baketime.cc |  2 +-
 .../transform/transform_mode_bbone_resize.cc     |  2 +-
 .../editors/transform/transform_mode_bend.cc     |  2 +-
 .../transform/transform_mode_boneenvelope.cc     |  2 +-
 .../editors/transform/transform_mode_boneroll.cc |  2 +-
 .../transform_mode_curveshrinkfatten.cc          |  2 +-
 .../transform/transform_mode_customdata.cc       |  2 +-
 .../transform_mode_edge_rotate_normal.cc         |  2 +-
 .../transform/transform_mode_edge_seq_slide.cc   |  2 +-
 .../transform/transform_mode_edge_slide.cc       |  2 +-
 .../transform/transform_mode_gpopacity.cc        |  2 +-
 .../transform/transform_mode_gpshrinkfatten.cc   |  2 +-
 .../transform/transform_mode_maskshrinkfatten.cc |  2 +-
 .../editors/transform/transform_mode_mirror.cc   |  2 +-
 .../transform/transform_mode_push_pull.cc        |  2 +-
 .../editors/transform/transform_mode_resize.cc   |  2 +-
 .../editors/transform/transform_mode_rotate.cc   |  2 +-
 .../editors/transform/transform_mode_shear.cc    |  2 +-
 .../transform/transform_mode_shrink_fatten.cc    |  2 +-
 .../transform/transform_mode_skin_resize.cc      |  2 +-
 .../editors/transform/transform_mode_tilt.cc     |  2 +-
 .../transform/transform_mode_timescale.cc        |  2 +-
 .../transform/transform_mode_timeslide.cc        |  2 +-
 .../transform/transform_mode_timetranslate.cc    |  2 +-
 .../editors/transform/transform_mode_tosphere.cc |  2 +-
 .../transform/transform_mode_trackball.cc        |  2 +-
 .../transform/transform_mode_translate.cc        |  2 +-
 .../transform/transform_mode_vert_slide.cc       |  2 +-
 .../editors/transform/transform_orientations.cc  |  6 +++---
 .../transform/transform_snap_sequencer.cc        |  2 +-
 source/blender/editors/undo/ed_undo.cc           |  2 +-
 source/blender/editors/undo/memfile_undo.cc      |  2 +-
 source/blender/editors/undo/undo_system_types.cc |  2 +-
 source/blender/editors/util/ed_draw.cc           |  6 +++---
 source/blender/editors/util/gizmo_utils.cc       |  2 +-
 source/blender/editors/util/select_utils.cc      |  2 +-
 .../editors/uvedit/uvedit_clipboard_graph_iso.cc |  2 +-
 source/blender/gpu/intern/gpu_select_next.cc     |  2 +-
 .../blender/ikplugin/intern/iksolver_plugin.cc   |  2 +-
 source/blender/imbuf/intern/allocimbuf.cc        |  2 +-
 source/blender/imbuf/intern/anim_movie.cc        | 10 +++++-----
 source/blender/imbuf/intern/cineon/cineon_dpx.cc |  6 +++---
 source/blender/imbuf/intern/cineon/cineonlib.cc  | 14 +++++++-------
 source/blender/imbuf/intern/cineon/dpxlib.cc     | 10 +++++-----
 .../blender/imbuf/intern/cineon/logImageCore.cc  |  6 +++---
 source/blender/imbuf/intern/cineon/logmemfile.cc |  6 +++---
 source/blender/imbuf/intern/colormanagement.cc   |  4 ++--
 source/blender/imbuf/intern/filetype.cc          |  2 +-
 source/blender/imbuf/intern/filter.cc            |  2 +-
 source/blender/imbuf/intern/imageprocess.cc      |  4 ++--
 source/blender/imbuf/intern/indexer.cc           |  2 +-
 source/blender/imbuf/intern/iris.cc              |  2 +-
 source/blender/imbuf/intern/jpeg.cc              |  4 ++--
 source/blender/imbuf/intern/metadata.cc          |  4 ++--
 source/blender/imbuf/intern/module.cc            |  2 +-
 source/blender/imbuf/intern/readimage.cc         |  2 +-
 source/blender/imbuf/intern/rectop.cc            |  2 +-
 source/blender/imbuf/intern/scaling.cc           |  2 +-
 source/blender/imbuf/intern/stereoimbuf.cc       |  2 +-
 source/blender/imbuf/intern/thumbs.cc            | 10 +++++-----
 source/blender/imbuf/intern/thumbs_blend.cc      |  6 +++---
 source/blender/imbuf/intern/util.cc              |  2 +-
 source/blender/imbuf/intern/writeimage.cc        |  6 +++---
 .../blender/io/ply/importer/ply_import_buffer.cc |  2 +-
 source/blender/makesdna/intern/dna_genfile.cc    |  8 ++++----
 source/blender/makesdna/intern/dna_utils.cc      |  2 +-
 source/blender/makesdna/intern/makesdna.cc       |  8 ++++----
 source/blender/makesrna/intern/makesrna.cc       | 16 ++++++++--------
 source/blender/makesrna/intern/rna_ID.cc         |  4 ++--
 .../intern/rna_access_compare_override.cc        |  2 +-
 source/blender/makesrna/intern/rna_action.cc     |  2 +-
 source/blender/makesrna/intern/rna_action_api.cc |  8 ++++----
 source/blender/makesrna/intern/rna_animation.cc  |  2 +-
 .../blender/makesrna/intern/rna_animation_api.cc |  4 ++--
 source/blender/makesrna/intern/rna_animviz.cc    |  2 +-
 source/blender/makesrna/intern/rna_armature.cc   |  2 +-
 .../blender/makesrna/intern/rna_armature_api.cc  |  8 ++++----
 source/blender/makesrna/intern/rna_asset.cc      |  2 +-
 source/blender/makesrna/intern/rna_attribute.cc  |  2 +-
 source/blender/makesrna/intern/rna_boid.cc       |  6 +++---
 source/blender/makesrna/intern/rna_brush.cc      |  2 +-
 source/blender/makesrna/intern/rna_camera.cc     |  2 +-
 source/blender/makesrna/intern/rna_camera_api.cc |  6 +++---
 source/blender/makesrna/intern/rna_cloth.cc      |  4 ++--
 source/blender/makesrna/intern/rna_collection.cc |  2 +-
 source/blender/makesrna/intern/rna_color.cc      |  4 ++--
 source/blender/makesrna/intern/rna_constraint.cc |  2 +-
 source/blender/makesrna/intern/rna_context.cc    |  2 +-
 source/blender/makesrna/intern/rna_curve.cc      |  2 +-
 source/blender/makesrna/intern/rna_curve_api.cc  |  4 ++--
 .../blender/makesrna/intern/rna_curveprofile.cc  |  4 ++--
 source/blender/makesrna/intern/rna_curves.cc     |  2 +-
 source/blender/makesrna/intern/rna_define.cc     | 14 +++++++-------
 source/blender/makesrna/intern/rna_depsgraph.cc  |  2 +-
 .../blender/makesrna/intern/rna_dynamicpaint.cc  |  4 ++--
 source/blender/makesrna/intern/rna_fcurve.cc     |  2 +-
 source/blender/makesrna/intern/rna_fcurve_api.cc |  8 ++++----
 source/blender/makesrna/intern/rna_fluid.cc      |  4 ++--
 .../makesrna/intern/rna_gpencil_legacy.cc        |  2 +-
 .../intern/rna_gpencil_legacy_modifier.cc        |  6 +++---
 source/blender/makesrna/intern/rna_image.cc      |  2 +-
 source/blender/makesrna/intern/rna_image_api.cc  |  8 ++++----
 source/blender/makesrna/intern/rna_key.cc        |  2 +-
 source/blender/makesrna/intern/rna_lattice.cc    |  2 +-
 .../blender/makesrna/intern/rna_lattice_api.cc   |  4 ++--
 source/blender/makesrna/intern/rna_light.cc      |  2 +-
 source/blender/makesrna/intern/rna_lightprobe.cc |  2 +-
 source/blender/makesrna/intern/rna_linestyle.cc  |  4 ++--
 source/blender/makesrna/intern/rna_main.cc       |  4 ++--
 source/blender/makesrna/intern/rna_main_api.cc   |  6 +++---
 source/blender/makesrna/intern/rna_mask.cc       |  4 ++--
 source/blender/makesrna/intern/rna_material.cc   |  4 ++--
 .../blender/makesrna/intern/rna_material_api.cc  |  4 ++--
 source/blender/makesrna/intern/rna_meta.cc       |  2 +-
 source/blender/makesrna/intern/rna_meta_api.cc   |  4 ++--
 source/blender/makesrna/intern/rna_modifier.cc   |  6 +++---
 source/blender/makesrna/intern/rna_movieclip.cc  |  4 ++--
 source/blender/makesrna/intern/rna_nla.cc        |  2 +-
 source/blender/makesrna/intern/rna_nodetree.cc   |  6 +++---
 source/blender/makesrna/intern/rna_object.cc     |  4 ++--
 source/blender/makesrna/intern/rna_object_api.cc |  8 ++++----
 .../blender/makesrna/intern/rna_object_force.cc  |  2 +-
 source/blender/makesrna/intern/rna_packedfile.cc |  2 +-
 source/blender/makesrna/intern/rna_palette.cc    |  2 +-
 source/blender/makesrna/intern/rna_particle.cc   |  6 +++---
 source/blender/makesrna/intern/rna_path.cc       |  3 +--
 source/blender/makesrna/intern/rna_pointcloud.cc |  2 +-
 source/blender/makesrna/intern/rna_pose.cc       |  4 ++--
 source/blender/makesrna/intern/rna_pose_api.cc   |  8 ++++----
 source/blender/makesrna/intern/rna_render.cc     |  2 +-
 source/blender/makesrna/intern/rna_rigidbody.cc  |  4 ++--
 source/blender/makesrna/intern/rna_rna.cc        |  2 +-
 source/blender/makesrna/intern/rna_scene.cc      |  2 +-
 source/blender/makesrna/intern/rna_scene_api.cc  |  4 ++--
 source/blender/makesrna/intern/rna_screen.cc     |  4 ++--
 .../blender/makesrna/intern/rna_sculpt_paint.cc  |  2 +-
 source/blender/makesrna/intern/rna_sequencer.cc  |  4 ++--
 .../blender/makesrna/intern/rna_sequencer_api.cc |  6 +++---
 source/blender/makesrna/intern/rna_shader_fx.cc  |  6 +++---
 source/blender/makesrna/intern/rna_sound.cc      |  2 +-
 source/blender/makesrna/intern/rna_space.cc      |  4 ++--
 source/blender/makesrna/intern/rna_speaker.cc    |  2 +-
 source/blender/makesrna/intern/rna_text.cc       |  4 ++--
 source/blender/makesrna/intern/rna_text_api.cc   |  4 ++--
 source/blender/makesrna/intern/rna_texture.cc    |  6 +++---
 .../blender/makesrna/intern/rna_texture_api.cc   |  6 +++---
 source/blender/makesrna/intern/rna_timeline.cc   |  2 +-
 source/blender/makesrna/intern/rna_tracking.cc   |  4 ++--
 source/blender/makesrna/intern/rna_ui.cc         |  2 +-
 source/blender/makesrna/intern/rna_ui_api.cc     |  4 ++--
 source/blender/makesrna/intern/rna_userdef.cc    |  4 ++--
 source/blender/makesrna/intern/rna_vfont.cc      |  2 +-
 source/blender/makesrna/intern/rna_volume.cc     |  2 +-
 source/blender/makesrna/intern/rna_wm.cc         |  2 +-
 source/blender/makesrna/intern/rna_wm_api.cc     |  6 +++---
 source/blender/makesrna/intern/rna_wm_gizmo.cc   |  2 +-
 .../blender/makesrna/intern/rna_wm_gizmo_api.cc  |  4 ++--
 .../blender/makesrna/intern/rna_workspace_api.cc |  8 ++++----
 source/blender/makesrna/intern/rna_world.cc      |  4 ++--
 .../nodes/texture/nodes/node_texture_distance.cc |  2 +-
 .../texture/nodes/node_texture_translate.cc      |  2 +-
 .../nodes/texture/nodes/node_texture_viewer.cc   |  2 +-
 source/blender/python/generic/imbuf_py_api.cc    |  2 +-
 source/blender/python/generic/py_capi_rna.cc     |  1 -
 source/blender/sequencer/intern/animation.cc     |  2 +-
 source/blender/sequencer/intern/channels.cc      |  2 +-
 source/blender/sequencer/intern/clipboard.cc     |  2 +-
 source/blender/sequencer/intern/disk_cache.cc    |  4 ++--
 source/blender/sequencer/intern/effects.cc       |  6 +++---
 source/blender/sequencer/intern/image_cache.cc   |  4 ++--
 source/blender/sequencer/intern/iterator.cc      |  2 +-
 source/blender/sequencer/intern/modifier.cc      |  4 ++--
 source/blender/sequencer/intern/prefetch.cc      |  6 +++---
 source/blender/sequencer/intern/render.cc        |  2 +-
 .../blender/sequencer/intern/sequence_lookup.cc  |  2 +-
 source/blender/sequencer/intern/sound.cc         |  2 +-
 source/blender/sequencer/intern/strip_add.cc     |  4 ++--
 source/blender/sequencer/intern/utils.cc         |  4 ++--
 .../blender/shader_fx/intern/FX_shader_blur.cc   |  2 +-
 .../shader_fx/intern/FX_shader_colorize.cc       |  2 +-
 .../blender/shader_fx/intern/FX_shader_flip.cc   |  2 +-
 .../blender/shader_fx/intern/FX_shader_glow.cc   |  2 +-
 .../blender/shader_fx/intern/FX_shader_pixel.cc  |  2 +-
 source/blender/shader_fx/intern/FX_shader_rim.cc |  2 +-
 .../blender/shader_fx/intern/FX_shader_shadow.cc |  2 +-
 .../blender/shader_fx/intern/FX_shader_swirl.cc  |  2 +-
 .../blender/shader_fx/intern/FX_shader_util.cc   |  2 +-
 .../blender/shader_fx/intern/FX_shader_wave.cc   |  2 +-
 391 files changed, 832 insertions(+), 834 deletions(-)

diff --git a/source/blender/blenfont/intern/blf.cc b/source/blender/blenfont/intern/blf.cc
index 81911b5765a..4aff5640921 100644
--- a/source/blender/blenfont/intern/blf.cc
+++ b/source/blender/blenfont/intern/blf.cc
@@ -10,10 +10,10 @@
  * Wraps OpenGL and FreeType.
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <ft2build.h>
 
diff --git a/source/blender/blenfont/intern/blf_dir.cc b/source/blender/blenfont/intern/blf_dir.cc
index 84cb56b4dd6..639484f5217 100644
--- a/source/blender/blenfont/intern/blf_dir.cc
+++ b/source/blender/blenfont/intern/blf_dir.cc
@@ -8,9 +8,9 @@
  * Manage search paths for font files.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <ft2build.h>
 
diff --git a/source/blender/blenfont/intern/blf_font.cc b/source/blender/blenfont/intern/blf_font.cc
index e06b027ae6b..e00121dc434 100644
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@@ -10,10 +10,10 @@
  * Also low level functions for managing \a FontBLF.
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <ft2build.h>
 
diff --git a/source/blender/blenfont/intern/blf_font_default.cc b/source/blender/blenfont/intern/blf_font_default.cc
index 613075b352b..c0e8db3c0cb 100644
--- a/source/blender/blenfont/intern/blf_font_default.cc
+++ b/source/blender/blenfont/intern/blf_font_default.cc
@@ -8,7 +8,7 @@
  * API for loading default font files.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "BLF_api.h"
 
diff --git a/source/blender/blenfont/intern/blf_glyph.cc b/source/blender/blenfont/intern/blf_glyph.cc
index 1a469d0d19b..8bc4e241cdd 100644
--- a/source/blender/blenfont/intern/blf_glyph.cc
+++ b/source/blender/blenfont/intern/blf_glyph.cc
@@ -8,10 +8,10 @@
  * Glyph rendering, texturing and caching. Wraps Freetype and OpenGL functions.
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <ft2build.h>
 
diff --git a/source/blender/blenfont/intern/blf_thumbs.cc b/source/blender/blenfont/intern/blf_thumbs.cc
index 66f0c8ffa07..0c66e0734c8 100644
--- a/source/blender/blenfont/intern/blf_thumbs.cc
+++ b/source/blender/blenfont/intern/blf_thumbs.cc
@@ -10,7 +10,7 @@
  * Isolate since this needs to be called by #ImBuf code (bad level call).
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <ft2build.h>
 
diff --git a/source/blender/blenfont/intern/blf_util.cc b/source/blender/blenfont/intern/blf_util.cc
index 97a8c5a3015..f9d3c558acb 100644
--- a/source/blender/blenfont/intern/blf_util.cc
+++ b/source/blender/blenfont/intern/blf_util.cc
@@ -8,9 +8,9 @@
  * Internal utility API for BLF.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.cc b/source/blender/blenkernel/intern/CCGSubSurf.cc
index 8042c60bb10..e4685f47402 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_util.cc b/source/blender/blenkernel/intern/CCGSubSurf_util.cc
index 43b7d7d4a1e..2699cb238f4 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_util.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf_util.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc
index 72562cc4003..cbe7a5f072b 100644
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/action_mirror.cc b/source/blender/blenkernel/intern/action_mirror.cc
index e706a07dd98..378dec970bc 100644
--- a/source/blender/blenkernel/intern/action_mirror.cc
+++ b/source/blender/blenkernel/intern/action_mirror.cc
@@ -8,8 +8,8 @@
  * Mirror/Symmetry functions applying to actions.
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/addon.cc b/source/blender/blenkernel/intern/addon.cc
index 4ac121322a2..d41d282b624 100644
--- a/source/blender/blenkernel/intern/addon.cc
+++ b/source/blender/blenkernel/intern/addon.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 #include "RNA_types.h"
 
diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc
index bb63d8e5398..e13748ed6de 100644
--- a/source/blender/blenkernel/intern/anim_data.cc
+++ b/source/blender/blenkernel/intern/anim_data.cc
@@ -7,7 +7,7 @@
  */
 #include "MEM_guardedalloc.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "BKE_action.h"
 #include "BKE_anim_data.h"
diff --git a/source/blender/blenkernel/intern/anim_path.cc b/source/blender/blenkernel/intern/anim_path.cc
index c155b85147b..1026a717d02 100644
--- a/source/blender/blenkernel/intern/anim_path.cc
+++ b/source/blender/blenkernel/intern/anim_path.cc
@@ -8,7 +8,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include <float.h>
+#include <cfloat>
 
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc
index 55716a8f788..0bc9f5430e4 100644
--- a/source/blender/blenkernel/intern/anim_sys.cc
+++ b/source/blender/blenkernel/intern/anim_sys.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/appdir.cc b/source/blender/blenkernel/intern/appdir.cc
index 7463efec89f..7835f886c0b 100644
--- a/source/blender/blenkernel/intern/appdir.cc
+++ b/source/blender/blenkernel/intern/appdir.cc
@@ -8,9 +8,9 @@
  * Access to application level directories.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_fileops.h"
 #include "BLI_fileops_types.h"
diff --git a/source/blender/blenkernel/intern/armature.cc b/source/blender/blenkernel/intern/armature.cc
index a8cc595fa47..04975019e8a 100644
--- a/source/blender/blenkernel/intern/armature.cc
+++ b/source/blender/blenkernel/intern/armature.cc
@@ -6,12 +6,12 @@
  * \ingroup bke
  */
 
-#include <ctype.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/armature_deform.cc b/source/blender/blenkernel/intern/armature_deform.cc
index 2f8118e0d6b..a0df126ffe3 100644
--- a/source/blender/blenkernel/intern/armature_deform.cc
+++ b/source/blender/blenkernel/intern/armature_deform.cc
@@ -8,12 +8,12 @@
  * Deform coordinates by a armature object (used by modifier).
  */
 
-#include <ctype.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/autoexec.cc b/source/blender/blenkernel/intern/autoexec.cc
index f6887e9b756..84ce1f40ed9 100644
--- a/source/blender/blenkernel/intern/autoexec.cc
+++ b/source/blender/blenkernel/intern/autoexec.cc
@@ -9,8 +9,8 @@
  * may add signing here later.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_userdef_types.h"
 
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index d7c4c92f034..90ea1fc1bff 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -8,9 +8,9 @@
  * Application level startup/shutdown functionality.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.cc b/source/blender/blenkernel/intern/blender_copybuffer.cc
index bda84d7540d..af3c04bf2b5 100644
--- a/source/blender/blenkernel/intern/blender_copybuffer.cc
+++ b/source/blender/blenkernel/intern/blender_copybuffer.cc
@@ -8,7 +8,7 @@
  * Used for copy/paste operator, (using a temporary file).
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/blender_undo.cc b/source/blender/blenkernel/intern/blender_undo.cc
index 6e6de65bd15..2e40b0e84e3 100644
--- a/source/blender/blenkernel/intern/blender_undo.cc
+++ b/source/blender/blenkernel/intern/blender_undo.cc
@@ -15,12 +15,12 @@
 #  include <io.h> /* for open close read */
 #endif
 
-#include <errno.h>
+#include <cerrno>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h> /* for open */
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/blender_user_menu.cc b/source/blender/blenkernel/intern/blender_user_menu.cc
index 897a25c6205..2ec5863c0de 100644
--- a/source/blender/blenkernel/intern/blender_user_menu.cc
+++ b/source/blender/blenkernel/intern/blender_user_menu.cc
@@ -8,7 +8,7 @@
  * User defined menu API.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc
index f0498a03060..1eb3c5ff425 100644
--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@@ -9,8 +9,8 @@
  * and functions for writing *partial* files (only selected data-blocks).
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc
index a62012d8350..aae2fd75402 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.cc
+++ b/source/blender/blenkernel/intern/blendfile_link_append.cc
@@ -10,8 +10,8 @@
  * collections/objects/object-data in current scene.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/boids.cc b/source/blender/blenkernel/intern/boids.cc
index 79d5690cf71..68ab303614b 100644
--- a/source/blender/blenkernel/intern/boids.cc
+++ b/source/blender/blenkernel/intern/boids.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc
index c839a1ef5e2..2070190a351 100644
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@@ -15,7 +15,7 @@
 
 #include <sys/stat.h>
 
-#include <string.h>
+#include <cstring>
 
 /* path/file handling stuff */
 #ifndef WIN32
diff --git a/source/blender/blenkernel/intern/cachefile.cc b/source/blender/blenkernel/intern/cachefile.cc
index 50ea61b32d8..19c993b1673 100644
--- a/source/blender/blenkernel/intern/cachefile.cc
+++ b/source/blender/blenkernel/intern/cachefile.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_cachefile_types.h"
diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc
index 55c3a946e0b..04a025155c6 100644
--- a/source/blender/blenkernel/intern/camera.cc
+++ b/source/blender/blenkernel/intern/camera.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 /* Allow using deprecated functionality for .blend file I/O. */
 #define DNA_DEPRECATED_ALLOW
diff --git a/source/blender/blenkernel/intern/collection.cc b/source/blender/blenkernel/intern/collection.cc
index 48b10881807..a46b9fadf99 100644
--- a/source/blender/blenkernel/intern/collection.cc
+++ b/source/blender/blenkernel/intern/collection.cc
@@ -11,7 +11,7 @@
 
 #include "CLG_log.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_blenlib.h"
 #include "BLI_iterator.h"
diff --git a/source/blender/blenkernel/intern/colortools.cc b/source/blender/blenkernel/intern/colortools.cc
index 00cb9a9a84c..8bec08a97ff 100644
--- a/source/blender/blenkernel/intern/colortools.cc
+++ b/source/blender/blenkernel/intern/colortools.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc
index 93a8a5f70f6..2e4c16a13c8 100644
--- a/source/blender/blenkernel/intern/constraint.cc
+++ b/source/blender/blenkernel/intern/constraint.cc
@@ -9,11 +9,11 @@
 /* Allow using deprecated functionality for .blend file I/O. */
 #define DNA_DEPRECATED_ALLOW
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/curve_bevel.cc b/source/blender/blenkernel/intern/curve_bevel.cc
index 49eaa6db0fb..a36eea6ef27 100644
--- a/source/blender/blenkernel/intern/curve_bevel.cc
+++ b/source/blender/blenkernel/intern/curve_bevel.cc
@@ -9,7 +9,7 @@
  * both extruding
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_alloca.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/blenkernel/intern/curve_deform.cc b/source/blender/blenkernel/intern/curve_deform.cc
index b25d1ea27f7..23de527f905 100644
--- a/source/blender/blenkernel/intern/curve_deform.cc
+++ b/source/blender/blenkernel/intern/curve_deform.cc
@@ -8,10 +8,10 @@
  * Deform coordinates by a curve object (used by modifier).
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/blenkernel/intern/customdata_file.cc b/source/blender/blenkernel/intern/customdata_file.cc
index 2d15b30e376..12c47d936f7 100644
--- a/source/blender/blenkernel/intern/customdata_file.cc
+++ b/source/blender/blenkernel/intern/customdata_file.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc
index 3741bb07449..9376a3c03fc 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.cc
+++ b/source/blender/blenkernel/intern/dynamicpaint.cc
@@ -8,8 +8,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 
 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
diff --git a/source/blender/blenkernel/intern/effect.cc b/source/blender/blenkernel/intern/effect.cc
index cba58a9f389..a880215fc30 100644
--- a/source/blender/blenkernel/intern/effect.cc
+++ b/source/blender/blenkernel/intern/effect.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <stdarg.h>
-#include <stddef.h>
+#include <cstdarg>
+#include <cstddef>
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/fcurve.cc b/source/blender/blenkernel/intern/fcurve.cc
index ac9b4949f70..dc66c13219e 100644
--- a/source/blender/blenkernel/intern/fcurve.cc
+++ b/source/blender/blenkernel/intern/fcurve.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/fcurve_cache.cc b/source/blender/blenkernel/intern/fcurve_cache.cc
index df238773bbc..d0ac7f1f2f2 100644
--- a/source/blender/blenkernel/intern/fcurve_cache.cc
+++ b/source/blender/blenkernel/intern/fcurve_cache.cc
@@ -8,8 +8,8 @@
  * Cache F-Curve look-ups.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/fmodifier.cc b/source/blender/blenkernel/intern/fmodifier.cc
index 9d1a424220a..dd72c520530 100644
--- a/source/blender/blenkernel/intern/fmodifier.cc
+++ b/source/blender/blenkernel/intern/fmodifier.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
index 0dc88f8ac79..dfb0207d05c 100644
--- a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc
index 4c35d29eebe..101812c0200 100644
--- a/source/blender/blenkernel/intern/gpencil_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_legacy.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
index 6c713ad138c..bcf9534e55d 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/gpencil_update_cache_legacy.cc b/source/blender/blenkernel/intern/gpencil_update_cache_legacy.cc
index 234af09c332..11a128bc5dc 100644
--- a/source/blender/blenkernel/intern/gpencil_update_cache_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_update_cache_legacy.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "BKE_gpencil_update_cache_legacy.h"
 
diff --git a/source/blender/blenkernel/intern/idprop.cc b/source/blender/blenkernel/intern/idprop.cc
index 1f1293e4432..70a2b4adc59 100644
--- a/source/blender/blenkernel/intern/idprop.cc
+++ b/source/blender/blenkernel/intern/idprop.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_endian_switch.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/blenkernel/intern/idprop_utils.cc b/source/blender/blenkernel/intern/idprop_utils.cc
index 763bb72e3cd..580531af7df 100644
--- a/source/blender/blenkernel/intern/idprop_utils.cc
+++ b/source/blender/blenkernel/intern/idprop_utils.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "BLI_dynstr.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/blenkernel/intern/idtype.cc b/source/blender/blenkernel/intern/idtype.cc
index e088f0601e9..561a76cd795 100644
--- a/source/blender/blenkernel/intern/idtype.cc
+++ b/source/blender/blenkernel/intern/idtype.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/image_gen.cc b/source/blender/blenkernel/intern/image_gen.cc
index 3eae2cdccad..0b79f14ca27 100644
--- a/source/blender/blenkernel/intern/image_gen.cc
+++ b/source/blender/blenkernel/intern/image_gen.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "BLI_math_base.h"
 #include "BLI_math_color.h"
diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc
index 31f335ade79..57f561cdd4c 100644
--- a/source/blender/blenkernel/intern/ipo.cc
+++ b/source/blender/blenkernel/intern/ipo.cc
@@ -14,10 +14,10 @@
  * -- Joshua Leung, Jan 2009
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 /* since we have versioning code here */
 #define DNA_DEPRECATED_ALLOW
diff --git a/source/blender/blenkernel/intern/keyconfig.cc b/source/blender/blenkernel/intern/keyconfig.cc
index e68af4694c9..93b7022b67b 100644
--- a/source/blender/blenkernel/intern/keyconfig.cc
+++ b/source/blender/blenkernel/intern/keyconfig.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 
 #include "RNA_types.h"
 
diff --git a/source/blender/blenkernel/intern/lattice.cc b/source/blender/blenkernel/intern/lattice.cc
index c3fe1ff8c80..83ada443de8 100644
--- a/source/blender/blenkernel/intern/lattice.cc
+++ b/source/blender/blenkernel/intern/lattice.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/lattice_deform.cc b/source/blender/blenkernel/intern/lattice_deform.cc
index b503f53aff7..861ee4ac68c 100644
--- a/source/blender/blenkernel/intern/lattice_deform.cc
+++ b/source/blender/blenkernel/intern/lattice_deform.cc
@@ -8,10 +8,10 @@
  * Deform coordinates by a lattice object (used by modifier).
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/layer_utils.cc b/source/blender/blenkernel/intern/layer_utils.cc
index da54b08cea0..6e9a3c84043 100644
--- a/source/blender/blenkernel/intern/layer_utils.cc
+++ b/source/blender/blenkernel/intern/layer_utils.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_array.h"
 
diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc
index cc4435f9e77..1c868a45fb1 100644
--- a/source/blender/blenkernel/intern/lib_id.cc
+++ b/source/blender/blenkernel/intern/lib_id.cc
@@ -9,11 +9,11 @@
  * allocate and free of all library data
  */
 
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/lib_query.cc b/source/blender/blenkernel/intern/lib_query.cc
index 5a00292b263..8fb29d0393a 100644
--- a/source/blender/blenkernel/intern/lib_query.cc
+++ b/source/blender/blenkernel/intern/lib_query.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 
diff --git a/source/blender/blenkernel/intern/light.cc b/source/blender/blenkernel/intern/light.cc
index 1855d5ca8c1..2e8eabd7d44 100644
--- a/source/blender/blenkernel/intern/light.cc
+++ b/source/blender/blenkernel/intern/light.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/lightprobe.cc b/source/blender/blenkernel/intern/lightprobe.cc
index e1288d6d26e..b680ccb3b2b 100644
--- a/source/blender/blenkernel/intern/lightprobe.cc
+++ b/source/blender/blenkernel/intern/lightprobe.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_collection_types.h"
 #include "DNA_defaults.h"
diff --git a/source/blender/blenkernel/intern/main.cc b/source/blender/blenkernel/intern/main.cc
index fc210091821..19eb2464734 100644
--- a/source/blender/blenkernel/intern/main.cc
+++ b/source/blender/blenkernel/intern/main.cc
@@ -8,7 +8,7 @@
  * Contains management of #Main database itself.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/main_idmap.cc b/source/blender/blenkernel/intern/main_idmap.cc
index c13f8ed9552..f38af77ab62 100644
--- a/source/blender/blenkernel/intern/main_idmap.cc
+++ b/source/blender/blenkernel/intern/main_idmap.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/mask.cc b/source/blender/blenkernel/intern/mask.cc
index 6243dbf681d..37cf164e052 100644
--- a/source/blender/blenkernel/intern/mask.cc
+++ b/source/blender/blenkernel/intern/mask.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <string.h>
+#include <cstddef>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/mask_evaluate.cc b/source/blender/blenkernel/intern/mask_evaluate.cc
index a7ef8028164..13fa590b582 100644
--- a/source/blender/blenkernel/intern/mask_evaluate.cc
+++ b/source/blender/blenkernel/intern/mask_evaluate.cc
@@ -8,8 +8,8 @@
  * Functions for evaluating the mask beziers into points for the outline and feather.
  */
 
-#include <stddef.h>
-#include <string.h>
+#include <cstddef>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc
index 982f33759c1..cb04b54d298 100644
--- a/source/blender/blenkernel/intern/movieclip.cc
+++ b/source/blender/blenkernel/intern/movieclip.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
+#include <cstdio>
+#include <cstring>
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 
 #ifndef WIN32
 #  include <unistd.h>
@@ -16,7 +16,7 @@
 #  include <io.h>
 #endif
 
-#include <time.h>
+#include <ctime>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/nla.cc b/source/blender/blenkernel/intern/nla.cc
index 5e65f7d5236..9fbd2f97f52 100644
--- a/source/blender/blenkernel/intern/nla.cc
+++ b/source/blender/blenkernel/intern/nla.cc
@@ -6,12 +6,12 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/object_deform.cc b/source/blender/blenkernel/intern/object_deform.cc
index d12bec724ec..8feadadf554 100644
--- a/source/blender/blenkernel/intern/object_deform.cc
+++ b/source/blender/blenkernel/intern/object_deform.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/ocean.cc b/source/blender/blenkernel/intern/ocean.cc
index 011c9f269a6..3002e34bf5e 100644
--- a/source/blender/blenkernel/intern/ocean.cc
+++ b/source/blender/blenkernel/intern/ocean.cc
@@ -9,10 +9,10 @@
  * OpenMP hints by Christian Schnellhammer
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/packedFile.cc b/source/blender/blenkernel/intern/packedFile.cc
index 0fd654637f7..6b99f265f01 100644
--- a/source/blender/blenkernel/intern/packedFile.cc
+++ b/source/blender/blenkernel/intern/packedFile.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
+#include <cstdio>
 #include <fcntl.h>
-#include <stdio.h>
 #include <sys/stat.h>
 
 #ifndef WIN32
@@ -16,7 +16,7 @@
 #  include <io.h>
 #endif
 #include "MEM_guardedalloc.h"
-#include <string.h>
+#include <cstring>
 
 #include "DNA_ID.h"
 #include "DNA_image_types.h"
diff --git a/source/blender/blenkernel/intern/paint_toolslots.cc b/source/blender/blenkernel/intern/paint_toolslots.cc
index f0761286b89..33cc934e88b 100644
--- a/source/blender/blenkernel/intern/paint_toolslots.cc
+++ b/source/blender/blenkernel/intern/paint_toolslots.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <limits.h>
+#include <climits>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc
index 462fdbef9c5..52a6e59a4f4 100644
--- a/source/blender/blenkernel/intern/particle_distribute.cc
+++ b/source/blender/blenkernel/intern/particle_distribute.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc
index 100926115b8..42cc56baa85 100644
--- a/source/blender/blenkernel/intern/particle_system.cc
+++ b/source/blender/blenkernel/intern/particle_system.cc
@@ -7,11 +7,11 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
+#include <cstddef>
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc
index bf1aaa765c9..60b58fdb68f 100644
--- a/source/blender/blenkernel/intern/pointcache.cc
+++ b/source/blender/blenkernel/intern/pointcache.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/source/blender/blenkernel/intern/preferences.cc b/source/blender/blenkernel/intern/preferences.cc
index a844469f181..aea151e4f09 100644
--- a/source/blender/blenkernel/intern/preferences.cc
+++ b/source/blender/blenkernel/intern/preferences.cc
@@ -8,7 +8,7 @@
  * User defined asset library API.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_asset_types.h"
 
diff --git a/source/blender/blenkernel/intern/report.cc b/source/blender/blenkernel/intern/report.cc
index be44e730df7..6e995a7b06d 100644
--- a/source/blender/blenkernel/intern/report.cc
+++ b/source/blender/blenkernel/intern/report.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc
index dbca8d5193a..1308b974b90 100644
--- a/source/blender/blenkernel/intern/rigidbody.cc
+++ b/source/blender/blenkernel/intern/rigidbody.cc
@@ -7,12 +7,12 @@
  * \brief Blender-side interface and methods for dealing with Rigid Body simulations
  */
 
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc
index df161545251..6580a3f0592 100644
--- a/source/blender/blenkernel/intern/screen.cc
+++ b/source/blender/blenkernel/intern/screen.cc
@@ -13,9 +13,9 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/shader_fx.cc b/source/blender/blenkernel/intern/shader_fx.cc
index 3bf76e7d346..734e94f6966 100644
--- a/source/blender/blenkernel/intern/shader_fx.cc
+++ b/source/blender/blenkernel/intern/shader_fx.cc
@@ -6,7 +6,7 @@
  * \ingroup bke
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc
index 7aedcd5a1f1..49cd60db005 100644
--- a/source/blender/blenkernel/intern/sound.cc
+++ b/source/blender/blenkernel/intern/sound.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/subdiv_deform.cc b/source/blender/blenkernel/intern/subdiv_deform.cc
index 07db4d7d0ff..849958d6fc8 100644
--- a/source/blender/blenkernel/intern/subdiv_deform.cc
+++ b/source/blender/blenkernel/intern/subdiv_deform.cc
@@ -8,7 +8,7 @@
 
 #include "BKE_subdiv_deform.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
diff --git a/source/blender/blenkernel/intern/subdiv_stats.cc b/source/blender/blenkernel/intern/subdiv_stats.cc
index c84769d1f68..32132eb3542 100644
--- a/source/blender/blenkernel/intern/subdiv_stats.cc
+++ b/source/blender/blenkernel/intern/subdiv_stats.cc
@@ -8,7 +8,7 @@
 
 #include "BKE_subdiv.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "PIL_time.h"
 
diff --git a/source/blender/blenkernel/intern/text.cc b/source/blender/blenkernel/intern/text.cc
index 21e264c8e67..66b495ddbc2 100644
--- a/source/blender/blenkernel/intern/text.cc
+++ b/source/blender/blenkernel/intern/text.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <stdlib.h> /* abort */
-#include <string.h> /* strstr */
+#include <cstdlib> /* abort */
+#include <cstring> /* strstr */
+#include <cwctype>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <wctype.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/text_suggestions.cc b/source/blender/blenkernel/intern/text_suggestions.cc
index be8313b371e..02ff0bd620a 100644
--- a/source/blender/blenkernel/intern/text_suggestions.cc
+++ b/source/blender/blenkernel/intern/text_suggestions.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/tracking.cc b/source/blender/blenkernel/intern/tracking.cc
index bad9538fbd7..43f4781f2ae 100644
--- a/source/blender/blenkernel/intern/tracking.cc
+++ b/source/blender/blenkernel/intern/tracking.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
+#include <climits>
+#include <cmath>
+#include <cstddef>
 #include <cstdint>
-#include <limits.h>
-#include <math.h>
 #include <memory.h>
-#include <stddef.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/tracking_auto.cc b/source/blender/blenkernel/intern/tracking_auto.cc
index 4aa182a6732..de1dd55b991 100644
--- a/source/blender/blenkernel/intern/tracking_auto.cc
+++ b/source/blender/blenkernel/intern/tracking_auto.cc
@@ -7,7 +7,7 @@
  */
 
 #include "atomic_ops.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/tracking_solver.cc b/source/blender/blenkernel/intern/tracking_solver.cc
index 57ff94a5298..9e64a52802f 100644
--- a/source/blender/blenkernel/intern/tracking_solver.cc
+++ b/source/blender/blenkernel/intern/tracking_solver.cc
@@ -8,7 +8,7 @@
  * This file contains blender-side implementation of camera solver.
  */
 
-#include <limits.h>
+#include <climits>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.cc b/source/blender/blenkernel/intern/tracking_stabilize.cc
index 9b99c816c3f..8ae113fbe42 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.cc
+++ b/source/blender/blenkernel/intern/tracking_stabilize.cc
@@ -8,7 +8,7 @@
  * This file contains implementation of 2D image stabilization.
  */
 
-#include <limits.h>
+#include <climits>
 
 #include "DNA_anim_types.h"
 #include "DNA_movieclip_types.h"
diff --git a/source/blender/blenkernel/intern/tracking_util.cc b/source/blender/blenkernel/intern/tracking_util.cc
index a3336fd70f1..d17b1fdd43b 100644
--- a/source/blender/blenkernel/intern/tracking_util.cc
+++ b/source/blender/blenkernel/intern/tracking_util.cc
@@ -9,7 +9,7 @@
  * by multiple tracking files but which should not be public.
  */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/undo_system.cc b/source/blender/blenkernel/intern/undo_system.cc
index 4ea67391f90..a03ef26f03d 100644
--- a/source/blender/blenkernel/intern/undo_system.cc
+++ b/source/blender/blenkernel/intern/undo_system.cc
@@ -8,8 +8,8 @@
  * Used by ED_undo.h, internal implementation.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/unit.cc b/source/blender/blenkernel/intern/unit.cc
index 940ea8aef30..f59d5b81e21 100644
--- a/source/blender/blenkernel/intern/unit.cc
+++ b/source/blender/blenkernel/intern/unit.cc
@@ -6,10 +6,10 @@
  * \ingroup bke
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/blenkernel/intern/vfont.cc b/source/blender/blenkernel/intern/vfont.cc
index 9d003fd5e9a..f932f7fadcf 100644
--- a/source/blender/blenkernel/intern/vfont.cc
+++ b/source/blender/blenkernel/intern/vfont.cc
@@ -6,11 +6,11 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wctype.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwctype>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/world.cc b/source/blender/blenkernel/intern/world.cc
index bfdde341677..ada8f565c34 100644
--- a/source/blender/blenkernel/intern/world.cc
+++ b/source/blender/blenkernel/intern/world.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/writeavi.cc b/source/blender/blenkernel/intern/writeavi.cc
index 2e1e096d854..aeab3c64e8e 100644
--- a/source/blender/blenkernel/intern/writeavi.cc
+++ b/source/blender/blenkernel/intern/writeavi.cc
@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc
index a1596b396df..e547fb6f661 100644
--- a/source/blender/blenloader/intern/versioning_280.cc
+++ b/source/blender/blenloader/intern/versioning_280.cc
@@ -9,8 +9,8 @@
 /* allow readfile to use deprecated functionality */
 #define DNA_DEPRECATED_ALLOW
 
-#include <float.h>
-#include <string.h>
+#include <cfloat>
+#include <cstring>
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
diff --git a/source/blender/blentranslation/intern/blt_lang.cc b/source/blender/blentranslation/intern/blt_lang.cc
index 2b0b3a83df6..c79fd393933 100644
--- a/source/blender/blentranslation/intern/blt_lang.cc
+++ b/source/blender/blentranslation/intern/blt_lang.cc
@@ -8,12 +8,12 @@
  * Main internationalization functions to set the locale and query available languages.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #ifndef _WIN32
-#  include <locale.h>
+#  include <clocale>
 #endif
 
 #include "RNA_types.h"
diff --git a/source/blender/blentranslation/intern/blt_translation.cc b/source/blender/blentranslation/intern/blt_translation.cc
index ee8b665ac6f..d5cff18f9a1 100644
--- a/source/blender/blentranslation/intern/blt_translation.cc
+++ b/source/blender/blentranslation/intern/blt_translation.cc
@@ -9,8 +9,8 @@
  * (which are optional and can be disabled as a preference).
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.cc b/source/blender/blentranslation/msgfmt/msgfmt.cc
index 7495580401d..f42939b4f0e 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.cc
+++ b/source/blender/blentranslation/msgfmt/msgfmt.cc
@@ -17,8 +17,8 @@
  * Usage: msgfmt input.po output.po
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_dynstr.h"
 #include "BLI_fileops.h"
diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc
index d07c55b3a05..62880634a97 100644
--- a/source/blender/editors/animation/anim_channels_defines.cc
+++ b/source/blender/editors/animation/anim_channels_defines.cc
@@ -6,7 +6,7 @@
  * \ingroup edanimation
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc
index fbdd99388fc..c30bc355d25 100644
--- a/source/blender/editors/animation/anim_channels_edit.cc
+++ b/source/blender/editors/animation/anim_channels_edit.cc
@@ -6,9 +6,9 @@
  * \ingroup edanimation
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/anim_deps.cc b/source/blender/editors/animation/anim_deps.cc
index fd186012d61..e6142eab095 100644
--- a/source/blender/editors/animation/anim_deps.cc
+++ b/source/blender/editors/animation/anim_deps.cc
@@ -6,7 +6,7 @@
  * \ingroup edanimation
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc
index b9605a6c28e..43d7cc487ff 100644
--- a/source/blender/editors/animation/anim_filter.cc
+++ b/source/blender/editors/animation/anim_filter.cc
@@ -25,7 +25,7 @@
  * -- Joshua Leung, Dec 2008 (Last revision July 2009)
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc
index 4050a27be8e..560cdd804c2 100644
--- a/source/blender/editors/animation/anim_markers.cc
+++ b/source/blender/editors/animation/anim_markers.cc
@@ -6,7 +6,7 @@
  * \ingroup edanimation
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc
index 5f248c64ed3..36041b1b66d 100644
--- a/source/blender/editors/animation/anim_motion_paths.cc
+++ b/source/blender/editors/animation/anim_motion_paths.cc
@@ -8,7 +8,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_dlrbTree.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc
index 156fab5aac0..5e9cbc2989f 100644
--- a/source/blender/editors/animation/anim_ops.cc
+++ b/source/blender/editors/animation/anim_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup edanimation
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "BLI_sys_types.h"
 
diff --git a/source/blender/editors/animation/drivers.cc b/source/blender/editors/animation/drivers.cc
index d5f80cc5515..981e5c748ce 100644
--- a/source/blender/editors/animation/drivers.cc
+++ b/source/blender/editors/animation/drivers.cc
@@ -6,9 +6,9 @@
  * \ingroup edanimation
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc
index 4d46f72a0b5..558e25c1763 100644
--- a/source/blender/editors/animation/fmodifier_ui.cc
+++ b/source/blender/editors/animation/fmodifier_ui.cc
@@ -13,7 +13,7 @@
  * F-Modifiers, as used by F-Curves in the Graph Editor and NLA-Strips in the NLA Editor.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/animation/keyframes_draw.cc b/source/blender/editors/animation/keyframes_draw.cc
index 88f4c697a97..89eab5a7e94 100644
--- a/source/blender/editors/animation/keyframes_draw.cc
+++ b/source/blender/editors/animation/keyframes_draw.cc
@@ -8,7 +8,7 @@
 
 /* System includes ----------------------------------------------------- */
 
-#include <float.h>
+#include <cfloat>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/keyframes_edit.cc b/source/blender/editors/animation/keyframes_edit.cc
index f2518881a56..fdc46286170 100644
--- a/source/blender/editors/animation/keyframes_edit.cc
+++ b/source/blender/editors/animation/keyframes_edit.cc
@@ -6,10 +6,10 @@
  * \ingroup edanimation
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc
index 9a500644fbd..8ffde296de6 100644
--- a/source/blender/editors/animation/keyframes_general.cc
+++ b/source/blender/editors/animation/keyframes_general.cc
@@ -6,10 +6,10 @@
  * \ingroup edanimation
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc
index 74a17fd05a7..2afe1ad59c8 100644
--- a/source/blender/editors/animation/keyframing.cc
+++ b/source/blender/editors/animation/keyframing.cc
@@ -6,11 +6,11 @@
  * \ingroup edanimation
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/animation/keyingsets.cc b/source/blender/editors/animation/keyingsets.cc
index c0b15957372..4dceb5710db 100644
--- a/source/blender/editors/animation/keyingsets.cc
+++ b/source/blender/editors/animation/keyingsets.cc
@@ -6,11 +6,11 @@
  * \ingroup edanimation
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/armature/armature_naming.cc b/source/blender/editors/armature/armature_naming.cc
index da0f4f36162..6a42baee5a9 100644
--- a/source/blender/editors/armature/armature_naming.cc
+++ b/source/blender/editors/armature/armature_naming.cc
@@ -9,7 +9,7 @@
  * This file contains functions/API's for renaming bones and/or working with them.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/armature/pose_group.cc b/source/blender/editors/armature/pose_group.cc
index f3bcc330e44..aeb08689702 100644
--- a/source/blender/editors/armature/pose_group.cc
+++ b/source/blender/editors/armature/pose_group.cc
@@ -7,7 +7,7 @@
  * Implementation of Bone Groups operators and editing API's.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc
index 71dcdd4cfb0..c2dc972162b 100644
--- a/source/blender/editors/armature/pose_lib_2.cc
+++ b/source/blender/editors/armature/pose_lib_2.cc
@@ -6,8 +6,8 @@
  * \ingroup edarmature
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/armature/pose_select.cc b/source/blender/editors/armature/pose_select.cc
index c7baa167f22..cbb45fdadcb 100644
--- a/source/blender/editors/armature/pose_select.cc
+++ b/source/blender/editors/armature/pose_select.cc
@@ -6,7 +6,7 @@
  * \ingroup edarmature
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
diff --git a/source/blender/editors/curve/curve_ops.cc b/source/blender/editors/curve/curve_ops.cc
index 4fbdbd256d3..eafbf9c9828 100644
--- a/source/blender/editors/curve/curve_ops.cc
+++ b/source/blender/editors/curve/curve_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup edcurve
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "DNA_curve_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/curve/editcurve_pen.cc b/source/blender/editors/curve/editcurve_pen.cc
index 825591e9e54..c9df6f19039 100644
--- a/source/blender/editors/curve/editcurve_pen.cc
+++ b/source/blender/editors/curve/editcurve_pen.cc
@@ -33,7 +33,7 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "float.h"
+#include <cfloat>
 
 #define FOREACH_SELECTED_BEZT_BEGIN(bezt, nurbs) \
   LISTBASE_FOREACH (Nurb *, nu, nurbs) { \
diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc
index 72f22482aa4..72e56616ffb 100644
--- a/source/blender/editors/curve/editfont.cc
+++ b/source/blender/editors/curve/editfont.cc
@@ -6,11 +6,11 @@
  * \ingroup edcurve
  */
 
-#include <errno.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/curve/editfont_undo.cc b/source/blender/editors/curve/editfont_undo.cc
index 17f91547e4a..9e18307e2a1 100644
--- a/source/blender/editors/curve/editfont_undo.cc
+++ b/source/blender/editors/curve/editfont_undo.cc
@@ -6,8 +6,8 @@
  * \ingroup edcurve
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/gpencil_legacy/annotate_draw.cc b/source/blender/editors/gpencil_legacy/annotate_draw.cc
index 48438516177..115226093b2 100644
--- a/source/blender/editors/gpencil_legacy/annotate_draw.cc
+++ b/source/blender/editors/gpencil_legacy/annotate_draw.cc
@@ -6,12 +6,12 @@
  * \ingroup edgpencil
  */
 
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc
index e8df2132768..510f982dc6a 100644
--- a/source/blender/editors/gpencil_legacy/annotate_paint.cc
+++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc
@@ -6,11 +6,11 @@
  * \ingroup edgpencil
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_undo.cc b/source/blender/editors/gpencil_legacy/gpencil_undo.cc
index 4449bed6c82..ad30727c8e8 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_undo.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_undo.cc
@@ -6,8 +6,8 @@
  * \ingroup edgpencil
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/lattice/editlattice_select.cc b/source/blender/editors/lattice/editlattice_select.cc
index 03a0c7b3950..c4ff1099974 100644
--- a/source/blender/editors/lattice/editlattice_select.cc
+++ b/source/blender/editors/lattice/editlattice_select.cc
@@ -6,7 +6,7 @@
  * \ingroup edlattice
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/lattice/editlattice_undo.cc b/source/blender/editors/lattice/editlattice_undo.cc
index 27b51d0bf79..c8975fdc746 100644
--- a/source/blender/editors/lattice/editlattice_undo.cc
+++ b/source/blender/editors/lattice/editlattice_undo.cc
@@ -6,9 +6,9 @@
  * \ingroup edlattice
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/mask/mask_editaction.cc b/source/blender/editors/mask/mask_editaction.cc
index 3bebf53fb0e..08e5508b20b 100644
--- a/source/blender/editors/mask/mask_editaction.cc
+++ b/source/blender/editors/mask/mask_editaction.cc
@@ -6,11 +6,11 @@
  * \ingroup edmask
  */
 
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/mask/mask_shapekey.cc b/source/blender/editors/mask/mask_shapekey.cc
index ad4295ce204..11003793d28 100644
--- a/source/blender/editors/mask/mask_shapekey.cc
+++ b/source/blender/editors/mask/mask_shapekey.cc
@@ -6,7 +6,7 @@
  * \ingroup edmask
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
diff --git a/source/blender/editors/metaball/editmball_undo.cc b/source/blender/editors/metaball/editmball_undo.cc
index 60f5ab47671..5cee9e7b6b1 100644
--- a/source/blender/editors/metaball/editmball_undo.cc
+++ b/source/blender/editors/metaball/editmball_undo.cc
@@ -6,8 +6,8 @@
  * \ingroup edmeta
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc
index d2038ddc3a1..f2bbb42a549 100644
--- a/source/blender/editors/metaball/mball_edit.cc
+++ b/source/blender/editors/metaball/mball_edit.cc
@@ -6,8 +6,8 @@
  * \ingroup edmeta
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_collection.cc b/source/blender/editors/object/object_collection.cc
index f89640c4856..d322bf319ae 100644
--- a/source/blender/editors/object/object_collection.cc
+++ b/source/blender/editors/object/object_collection.cc
@@ -6,7 +6,7 @@
  * \ingroup edobj
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc
index 5223728f735..8042723be91 100644
--- a/source/blender/editors/object/object_constraint.cc
+++ b/source/blender/editors/object/object_constraint.cc
@@ -6,8 +6,8 @@
  * \ingroup edobj
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc
index 04c04a2c466..545df31b33e 100644
--- a/source/blender/editors/object/object_edit.cc
+++ b/source/blender/editors/object/object_edit.cc
@@ -6,13 +6,13 @@
  * \ingroup edobj
  */
 
-#include <ctype.h>
-#include <float.h>
-#include <math.h>
-#include <stddef.h> /* For `offsetof`. */
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cctype>
+#include <cfloat>
+#include <cmath>
+#include <cstddef> /* For `offsetof`. */
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_gpencil_modifier.cc b/source/blender/editors/object/object_gpencil_modifier.cc
index f79ea5ce2ce..59f06cb8c81 100644
--- a/source/blender/editors/object/object_gpencil_modifier.cc
+++ b/source/blender/editors/object/object_gpencil_modifier.cc
@@ -6,10 +6,10 @@
  * \ingroup edobj
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc
index 3d0c0742ed9..314a710b3cb 100644
--- a/source/blender/editors/object/object_hook.cc
+++ b/source/blender/editors/object/object_hook.cc
@@ -6,8 +6,8 @@
  * \ingroup edobj
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_ops.cc b/source/blender/editors/object/object_ops.cc
index edab2e6429f..7b64d210d9d 100644
--- a/source/blender/editors/object/object_ops.cc
+++ b/source/blender/editors/object/object_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup edobj
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "DNA_object_types.h"
 
diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc
index 70baa55b3ae..e9d794bd5ec 100644
--- a/source/blender/editors/object/object_relations.cc
+++ b/source/blender/editors/object/object_relations.cc
@@ -6,9 +6,9 @@
  * \ingroup edobj
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc
index 47d754880a5..af41fda2c20 100644
--- a/source/blender/editors/object/object_select.cc
+++ b/source/blender/editors/object/object_select.cc
@@ -6,10 +6,10 @@
  * \ingroup edobj
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_shader_fx.cc b/source/blender/editors/object/object_shader_fx.cc
index 6ae87a78b7c..316a8f4e367 100644
--- a/source/blender/editors/object/object_shader_fx.cc
+++ b/source/blender/editors/object/object_shader_fx.cc
@@ -6,10 +6,10 @@
  * \ingroup edobj
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc
index 7f716e0b5ea..d283bb25b61 100644
--- a/source/blender/editors/object/object_shapekey.cc
+++ b/source/blender/editors/object/object_shapekey.cc
@@ -6,8 +6,8 @@
  * \ingroup edobj
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #ifndef WIN32
 #  include <unistd.h>
diff --git a/source/blender/editors/object/object_utils.cc b/source/blender/editors/object/object_utils.cc
index f19657a308f..09f50be6928 100644
--- a/source/blender/editors/object/object_utils.cc
+++ b/source/blender/editors/object/object_utils.cc
@@ -6,8 +6,8 @@
  * \ingroup edobj
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
diff --git a/source/blender/editors/object/object_volume.cc b/source/blender/editors/object/object_volume.cc
index 4152d6324b9..474a9321493 100644
--- a/source/blender/editors/object/object_volume.cc
+++ b/source/blender/editors/object/object_volume.cc
@@ -6,7 +6,7 @@
  * \ingroup edobj
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_listbase.h"
 #include "BLI_math_base.h"
diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc
index 3a776aaa5a4..381b55eeeed 100644
--- a/source/blender/editors/physics/dynamicpaint_ops.cc
+++ b/source/blender/editors/physics/dynamicpaint_ops.cc
@@ -6,9 +6,9 @@
  * \ingroup edphys
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/particle_boids.cc b/source/blender/editors/physics/particle_boids.cc
index 173ab1be45e..4ff01dd53cb 100644
--- a/source/blender/editors/physics/particle_boids.cc
+++ b/source/blender/editors/physics/particle_boids.cc
@@ -6,7 +6,7 @@
  * \ingroup edphys
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc
index d02626c6e0e..d7e275bbd7a 100644
--- a/source/blender/editors/physics/particle_edit.cc
+++ b/source/blender/editors/physics/particle_edit.cc
@@ -6,9 +6,9 @@
  * \ingroup edphys
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/particle_edit_undo.cc b/source/blender/editors/physics/particle_edit_undo.cc
index 4da9718773e..8d766f2a23c 100644
--- a/source/blender/editors/physics/particle_edit_undo.cc
+++ b/source/blender/editors/physics/particle_edit_undo.cc
@@ -6,9 +6,9 @@
  * \ingroup edphys
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc
index ed18a9319e2..353faf10820 100644
--- a/source/blender/editors/physics/particle_object.cc
+++ b/source/blender/editors/physics/particle_object.cc
@@ -6,8 +6,8 @@
  * \ingroup edphys
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/physics_fluid.cc b/source/blender/editors/physics/physics_fluid.cc
index d30a19fb944..09680b68bcc 100644
--- a/source/blender/editors/physics/physics_fluid.cc
+++ b/source/blender/editors/physics/physics_fluid.cc
@@ -6,9 +6,9 @@
  * \ingroup edphys
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/editors/physics/physics_ops.cc b/source/blender/editors/physics/physics_ops.cc
index e340b6abed1..21dafc13c08 100644
--- a/source/blender/editors/physics/physics_ops.cc
+++ b/source/blender/editors/physics/physics_ops.cc
@@ -6,7 +6,7 @@
  * \ingroup edphys
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "WM_api.h"
 
diff --git a/source/blender/editors/physics/physics_pointcache.cc b/source/blender/editors/physics/physics_pointcache.cc
index 0ce5e7912d7..9d53d39f94e 100644
--- a/source/blender/editors/physics/physics_pointcache.cc
+++ b/source/blender/editors/physics/physics_pointcache.cc
@@ -6,8 +6,8 @@
  * \ingroup edphys
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/physics/rigidbody_constraint.cc b/source/blender/editors/physics/rigidbody_constraint.cc
index 16281700755..a150bc45b90 100644
--- a/source/blender/editors/physics/rigidbody_constraint.cc
+++ b/source/blender/editors/physics/rigidbody_constraint.cc
@@ -7,8 +7,8 @@
  * \brief Rigid Body constraint editing operators
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_collection_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/physics/rigidbody_object.cc b/source/blender/editors/physics/rigidbody_object.cc
index bab45b04a5e..962dd8d5a2e 100644
--- a/source/blender/editors/physics/rigidbody_object.cc
+++ b/source/blender/editors/physics/rigidbody_object.cc
@@ -7,8 +7,8 @@
  * \brief Rigid Body object editing operators
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_collection_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/physics/rigidbody_world.cc b/source/blender/editors/physics/rigidbody_world.cc
index e75c79cf662..f2138c22a4d 100644
--- a/source/blender/editors/physics/rigidbody_world.cc
+++ b/source/blender/editors/physics/rigidbody_world.cc
@@ -7,8 +7,8 @@
  * \brief Rigid Body world editing operators
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_object_types.h"
 #include "DNA_rigidbody_types.h"
diff --git a/source/blender/editors/scene/scene_edit.cc b/source/blender/editors/scene/scene_edit.cc
index 4630c233ee1..cdcda6cd515 100644
--- a/source/blender/editors/scene/scene_edit.cc
+++ b/source/blender/editors/scene/scene_edit.cc
@@ -6,8 +6,8 @@
  * \ingroup edscene
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "BLI_compiler_attrs.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc
index 7506440b81a..5c25325c512 100644
--- a/source/blender/editors/screen/area.cc
+++ b/source/blender/editors/screen/area.cc
@@ -6,8 +6,8 @@
  * \ingroup edscr
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/screen/glutil.cc b/source/blender/editors/screen/glutil.cc
index 198d22926a7..d835ec0ee04 100644
--- a/source/blender/editors/screen/glutil.cc
+++ b/source/blender/editors/screen/glutil.cc
@@ -6,8 +6,8 @@
  * \ingroup edscr
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_userdef_types.h"
 #include "DNA_vec_types.h"
diff --git a/source/blender/editors/screen/screen_context.cc b/source/blender/editors/screen/screen_context.cc
index 84468f11989..617ff769b32 100644
--- a/source/blender/editors/screen/screen_context.cc
+++ b/source/blender/editors/screen/screen_context.cc
@@ -6,9 +6,9 @@
  * \ingroup edscr
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc
index 305a2951fbf..28edd177524 100644
--- a/source/blender/editors/screen/screen_edit.cc
+++ b/source/blender/editors/screen/screen_edit.cc
@@ -6,8 +6,8 @@
  * \ingroup edscr
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc
index 26ea1a21638..d780a40051b 100644
--- a/source/blender/editors/screen/screen_ops.cc
+++ b/source/blender/editors/screen/screen_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup edscr
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/screen/screen_user_menu.cc b/source/blender/editors/screen/screen_user_menu.cc
index 506623d743f..83d028366cf 100644
--- a/source/blender/editors/screen/screen_user_menu.cc
+++ b/source/blender/editors/screen/screen_user_menu.cc
@@ -6,10 +6,10 @@
  * \ingroup spview3d
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc
index 0cb43a2436a..681bf920df6 100644
--- a/source/blender/editors/screen/screendump.cc
+++ b/source/blender/editors/screen/screendump.cc
@@ -7,8 +7,8 @@
  * Making screenshots of the entire window or sub-regions.
  */
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/screen/workspace_edit.cc b/source/blender/editors/screen/workspace_edit.cc
index be3c1f65836..449d8a4683e 100644
--- a/source/blender/editors/screen/workspace_edit.cc
+++ b/source/blender/editors/screen/workspace_edit.cc
@@ -6,8 +6,8 @@
  * \ingroup edscr
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/editors/screen/workspace_layout_edit.cc b/source/blender/editors/screen/workspace_layout_edit.cc
index 8c163f00a38..ee9d3488790 100644
--- a/source/blender/editors/screen/workspace_layout_edit.cc
+++ b/source/blender/editors/screen/workspace_layout_edit.cc
@@ -6,7 +6,7 @@
  * \ingroup edscr
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc
index 47453aa0004..986ba028220 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc
@@ -30,7 +30,7 @@
  * Operators must have the OPTYPE_UNDO flag set for this to work properly.
  */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index fed256fe05e..52452ab63ce 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -6,10 +6,10 @@
  * \ingroup edsnd
  */
 
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc
index 8f25ec8e2d2..8d65955e586 100644
--- a/source/blender/editors/space_buttons/buttons_context.cc
+++ b/source/blender/editors/space_buttons/buttons_context.cc
@@ -6,8 +6,8 @@
  * \ingroup spbuttons
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.cc b/source/blender/editors/space_buttons/buttons_ops.cc
index 1d904d1ac05..d241b006ed1 100644
--- a/source/blender/editors/space_buttons/buttons_ops.cc
+++ b/source/blender/editors/space_buttons/buttons_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup spbuttons
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_buttons/space_buttons.cc b/source/blender/editors/space_buttons/space_buttons.cc
index 395d8fb338d..80b55117e19 100644
--- a/source/blender/editors/space_buttons/space_buttons.cc
+++ b/source/blender/editors/space_buttons/space_buttons.cc
@@ -6,8 +6,8 @@
  * \ingroup spbuttons
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc
index 63ab39ef3fb..920044bc2c4 100644
--- a/source/blender/editors/space_clip/clip_buttons.cc
+++ b/source/blender/editors/space_clip/clip_buttons.cc
@@ -6,8 +6,8 @@
  * \ingroup spclip
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_clip/clip_editor.cc b/source/blender/editors/space_clip/clip_editor.cc
index f2ae9c4ccde..419b0f31dfe 100644
--- a/source/blender/editors/space_clip/clip_editor.cc
+++ b/source/blender/editors/space_clip/clip_editor.cc
@@ -6,9 +6,9 @@
  * \ingroup spclip
  */
 
-#include <errno.h>
+#include <cerrno>
+#include <cstddef>
 #include <fcntl.h>
-#include <stddef.h>
 #include <sys/types.h>
 
 #ifndef WIN32
diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc
index 0b778cc160d..27e14761d45 100644
--- a/source/blender/editors/space_clip/clip_ops.cc
+++ b/source/blender/editors/space_clip/clip_ops.cc
@@ -6,7 +6,7 @@
  * \ingroup spclip
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/types.h>
 
diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc
index d6af1651df1..e16fc2005ab 100644
--- a/source/blender/editors/space_clip/space_clip.cc
+++ b/source/blender/editors/space_clip/space_clip.cc
@@ -6,8 +6,8 @@
  * \ingroup spclip
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_defaults.h"
 
diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc
index 3fe8a059d1e..fc566cc3687 100644
--- a/source/blender/editors/space_file/file_ops.cc
+++ b/source/blender/editors/space_file/file_ops.cc
@@ -49,11 +49,11 @@
 #include "filelist.h"
 #include "fsmenu.h"
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 /* -------------------------------------------------------------------- */
 /** \name File Selection Utilities
diff --git a/source/blender/editors/space_file/file_panels.cc b/source/blender/editors/space_file/file_panels.cc
index 4bbbb659e4c..e29ff1fa4ce 100644
--- a/source/blender/editors/space_file/file_panels.cc
+++ b/source/blender/editors/space_file/file_panels.cc
@@ -37,7 +37,7 @@
 #include "filelist.h"
 #include "fsmenu.h"
 
-#include <string.h>
+#include <cstring>
 
 static bool file_panel_operator_poll(const bContext *C, PanelType * /*pt*/)
 {
diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc
index 8e4b6961a94..a3e07776129 100644
--- a/source/blender/editors/space_file/space_file.cc
+++ b/source/blender/editors/space_file/space_file.cc
@@ -6,8 +6,8 @@
  * \ingroup spfile
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc
index cc5f2544572..2161a8174ce 100644
--- a/source/blender/editors/space_graph/graph_buttons.cc
+++ b/source/blender/editors/space_graph/graph_buttons.cc
@@ -8,10 +8,10 @@
  * Graph editor space & buttons.
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/space_graph/graph_draw.cc b/source/blender/editors/space_graph/graph_draw.cc
index d601383367b..df3cb94824f 100644
--- a/source/blender/editors/space_graph/graph_draw.cc
+++ b/source/blender/editors/space_graph/graph_draw.cc
@@ -6,10 +6,10 @@
  * \ingroup spgraph
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc
index e6e69796fcc..6b6d70decc6 100644
--- a/source/blender/editors/space_graph/graph_edit.cc
+++ b/source/blender/editors/space_graph/graph_edit.cc
@@ -8,10 +8,10 @@
  * Insert duplicate and bake keyframes.
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #ifdef WITH_AUDASPACE
 #  include <AUD_Special.h>
diff --git a/source/blender/editors/space_graph/graph_ops.cc b/source/blender/editors/space_graph/graph_ops.cc
index 59a79463739..32441057554 100644
--- a/source/blender/editors/space_graph/graph_ops.cc
+++ b/source/blender/editors/space_graph/graph_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup spgraph
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/editors/space_graph/graph_select.cc b/source/blender/editors/space_graph/graph_select.cc
index bf0cf748c2e..ee1a678ecce 100644
--- a/source/blender/editors/space_graph/graph_select.cc
+++ b/source/blender/editors/space_graph/graph_select.cc
@@ -6,10 +6,10 @@
  * \ingroup spgraph
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc
index d14c1fa4650..80abc130e90 100644
--- a/source/blender/editors/space_graph/graph_slider_ops.cc
+++ b/source/blender/editors/space_graph/graph_slider_ops.cc
@@ -12,8 +12,8 @@
  * to modify the operator.
  */
 
-#include <float.h>
-#include <string.h>
+#include <cfloat>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_graph/graph_utils.cc b/source/blender/editors/space_graph/graph_utils.cc
index b6f4aecbf47..52e4c0e8723 100644
--- a/source/blender/editors/space_graph/graph_utils.cc
+++ b/source/blender/editors/space_graph/graph_utils.cc
@@ -6,10 +6,10 @@
  * \ingroup spgraph
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_screen_types.h"
diff --git a/source/blender/editors/space_graph/graph_view.cc b/source/blender/editors/space_graph/graph_view.cc
index 7c05bde9c60..f01cb8b14a2 100644
--- a/source/blender/editors/space_graph/graph_view.cc
+++ b/source/blender/editors/space_graph/graph_view.cc
@@ -6,7 +6,7 @@
  * \ingroup spgraph
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc
index 493fefc5f07..f3e972f4ab1 100644
--- a/source/blender/editors/space_graph/space_graph.cc
+++ b/source/blender/editors/space_graph/space_graph.cc
@@ -6,8 +6,8 @@
  * \ingroup spgraph
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_collection_types.h"
diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc
index 4b31725bd62..eea0ba10b49 100644
--- a/source/blender/editors/space_image/image_buttons.cc
+++ b/source/blender/editors/space_image/image_buttons.cc
@@ -6,8 +6,8 @@
  * \ingroup spimage
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc
index aa28ebdb79a..0081fd618ca 100644
--- a/source/blender/editors/space_image/image_draw.cc
+++ b/source/blender/editors/space_image/image_draw.cc
@@ -6,9 +6,9 @@
  * \ingroup spimage
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc
index 0e0213f4e9e..37b78a37f7b 100644
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -6,11 +6,11 @@
  * \ingroup spimage
  */
 
-#include <errno.h>
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #ifndef WIN32
 #  include <unistd.h>
 #else
diff --git a/source/blender/editors/space_image/image_sequence.cc b/source/blender/editors/space_image/image_sequence.cc
index e9f91e378d8..294c5a909d3 100644
--- a/source/blender/editors/space_image/image_sequence.cc
+++ b/source/blender/editors/space_image/image_sequence.cc
@@ -6,7 +6,7 @@
  * \ingroup spimage
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_script/script_edit.cc b/source/blender/editors/space_script/script_edit.cc
index ab874e2eb7b..383a252e2a6 100644
--- a/source/blender/editors/space_script/script_edit.cc
+++ b/source/blender/editors/space_script/script_edit.cc
@@ -6,8 +6,8 @@
  * \ingroup spscript
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/editors/space_script/script_ops.cc b/source/blender/editors/space_script/script_ops.cc
index 1c973a46716..576b6f3fb54 100644
--- a/source/blender/editors/space_script/script_ops.cc
+++ b/source/blender/editors/space_script/script_ops.cc
@@ -6,8 +6,8 @@
  * \ingroup spscript
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "WM_api.h"
 
diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc
index 02c297afbc2..e48240788ac 100644
--- a/source/blender/editors/space_script/space_script.cc
+++ b/source/blender/editors/space_script/space_script.cc
@@ -6,8 +6,8 @@
  * \ingroup spscript
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc
index a6e239be3e2..800c67598d2 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.cc
+++ b/source/blender/editors/space_sequencer/sequencer_add.cc
@@ -6,10 +6,10 @@
  * \ingroup spseq
  */
 
+#include <cctype>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_statusbar/space_statusbar.cc b/source/blender/editors/space_statusbar/space_statusbar.cc
index 54b064d1eee..61f9af6a4c8 100644
--- a/source/blender/editors/space_statusbar/space_statusbar.cc
+++ b/source/blender/editors/space_statusbar/space_statusbar.cc
@@ -6,8 +6,8 @@
  * \ingroup spstatusbar
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_text/space_text.cc b/source/blender/editors/space_text/space_text.cc
index 25dea4da41b..5e6864a9adf 100644
--- a/source/blender/editors/space_text/space_text.cc
+++ b/source/blender/editors/space_text/space_text.cc
@@ -6,7 +6,7 @@
  * \ingroup sptext
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_text_types.h"
 
diff --git a/source/blender/editors/space_text/text_autocomplete.cc b/source/blender/editors/space_text/text_autocomplete.cc
index ecaf11a9fbb..a382e56a74c 100644
--- a/source/blender/editors/space_text/text_autocomplete.cc
+++ b/source/blender/editors/space_text/text_autocomplete.cc
@@ -6,8 +6,8 @@
  * \ingroup sptext
  */
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_topbar/space_topbar.cc b/source/blender/editors/space_topbar/space_topbar.cc
index e27299fe6ad..8fe0a231b48 100644
--- a/source/blender/editors/space_topbar/space_topbar.cc
+++ b/source/blender/editors/space_topbar/space_topbar.cc
@@ -6,8 +6,8 @@
  * \ingroup sptopbar
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_userpref/space_userpref.cc b/source/blender/editors/space_userpref/space_userpref.cc
index e2ac1b56d18..49d7c30ae88 100644
--- a/source/blender/editors/space_userpref/space_userpref.cc
+++ b/source/blender/editors/space_userpref/space_userpref.cc
@@ -6,8 +6,8 @@
  * \ingroup spuserpref
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_userpref/userpref_ops.cc b/source/blender/editors/space_userpref/userpref_ops.cc
index 0a1c0543278..6395e8c97fa 100644
--- a/source/blender/editors/space_userpref/userpref_ops.cc
+++ b/source/blender/editors/space_userpref/userpref_ops.cc
@@ -6,7 +6,7 @@
  * \ingroup spuserpref
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc
index 530f7673171..385e6028096 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.cc
+++ b/source/blender/editors/space_view3d/view3d_buttons.cc
@@ -6,10 +6,10 @@
  * \ingroup spview3d
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/editors/space_view3d/view3d_header.cc b/source/blender/editors/space_view3d/view3d_header.cc
index 47f9586a46a..87068142fcb 100644
--- a/source/blender/editors/space_view3d/view3d_header.cc
+++ b/source/blender/editors/space_view3d/view3d_header.cc
@@ -6,9 +6,9 @@
  * \ingroup spview3d
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc
index 63268dcbbd0..e7920d1cef1 100644
--- a/source/blender/editors/space_view3d/view3d_utils.cc
+++ b/source/blender/editors/space_view3d/view3d_utils.cc
@@ -8,10 +8,10 @@
  * 3D View checks and manipulation (no operators).
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc
index 2fc7857ccdf..0d83a179864 100644
--- a/source/blender/editors/transform/transform.cc
+++ b/source/blender/editors/transform/transform.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc
index f909eb75b17..f5c9fcf4b3e 100644
--- a/source/blender/editors/transform/transform_constraints.cc
+++ b/source/blender/editors/transform/transform_constraints.cc
@@ -6,10 +6,10 @@
  * \ingroup edtransform
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/transform/transform_convert_nla.cc b/source/blender/editors/transform/transform_convert_nla.cc
index 05ceb8f8ee1..d26387b3b82 100644
--- a/source/blender/editors/transform/transform_convert_nla.cc
+++ b/source/blender/editors/transform/transform_convert_nla.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_anim_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/editors/transform/transform_generics.cc b/source/blender/editors/transform/transform_generics.cc
index afa3acee595..eec21b8b858 100644
--- a/source/blender/editors/transform/transform_generics.cc
+++ b/source/blender/editors/transform/transform_generics.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_input.cc b/source/blender/editors/transform/transform_input.cc
index a5368b0021a..1d19ad0846b 100644
--- a/source/blender/editors/transform/transform_input.cc
+++ b/source/blender/editors/transform/transform_input.cc
@@ -6,8 +6,8 @@
  * \ingroup edtransform
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/editors/transform/transform_mode.cc b/source/blender/editors/transform/transform_mode.cc
index bcf0bf1a0f6..db68f175b48 100644
--- a/source/blender/editors/transform/transform_mode.cc
+++ b/source/blender/editors/transform/transform_mode.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
diff --git a/source/blender/editors/transform/transform_mode_align.cc b/source/blender/editors/transform/transform_mode_align.cc
index a95aa54b505..a927d1a5e03 100644
--- a/source/blender/editors/transform/transform_mode_align.cc
+++ b/source/blender/editors/transform/transform_mode_align.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 
diff --git a/source/blender/editors/transform/transform_mode_baketime.cc b/source/blender/editors/transform/transform_mode_baketime.cc
index 5c8cbd60d34..87cccfda592 100644
--- a/source/blender/editors/transform/transform_mode_baketime.cc
+++ b/source/blender/editors/transform/transform_mode_baketime.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.cc b/source/blender/editors/transform/transform_mode_bbone_resize.cc
index 2f41b20a0eb..aeba036279f 100644
--- a/source/blender/editors/transform/transform_mode_bbone_resize.cc
+++ b/source/blender/editors/transform/transform_mode_bbone_resize.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_bend.cc b/source/blender/editors/transform/transform_mode_bend.cc
index f5810f68004..d4cc16ddcf9 100644
--- a/source/blender/editors/transform/transform_mode_bend.cc
+++ b/source/blender/editors/transform/transform_mode_bend.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.cc b/source/blender/editors/transform/transform_mode_boneenvelope.cc
index 90230e570fa..d4abbdb5931 100644
--- a/source/blender/editors/transform/transform_mode_boneenvelope.cc
+++ b/source/blender/editors/transform/transform_mode_boneenvelope.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_boneroll.cc b/source/blender/editors/transform/transform_mode_boneroll.cc
index 93fe93c5316..110ef74d806 100644
--- a/source/blender/editors/transform/transform_mode_boneroll.cc
+++ b/source/blender/editors/transform/transform_mode_boneroll.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc
index 8d5deb52c3c..21640b0161d 100644
--- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc
+++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_math_bits.h"
diff --git a/source/blender/editors/transform/transform_mode_customdata.cc b/source/blender/editors/transform/transform_mode_customdata.cc
index 62d6d41a982..7707ac8b417 100644
--- a/source/blender/editors/transform/transform_mode_customdata.cc
+++ b/source/blender/editors/transform/transform_mode_customdata.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc
index f8a689d7fe1..46c2b8b408d 100644
--- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc
+++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 
diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc
index a7758daa3de..26a3702af2d 100644
--- a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc
+++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc
index b9bb78e8c91..5f410424de7 100644
--- a/source/blender/editors/transform/transform_mode_edge_slide.cc
+++ b/source/blender/editors/transform/transform_mode_edge_slide.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_mode_gpopacity.cc b/source/blender/editors/transform/transform_mode_gpopacity.cc
index ed8c1da8076..1fee7642588 100644
--- a/source/blender/editors/transform/transform_mode_gpopacity.cc
+++ b/source/blender/editors/transform/transform_mode_gpopacity.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc
index 21eea8f1ee5..52ae6a261f3 100644
--- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc
+++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc
index c4c37ace6ed..7277b8fd88e 100644
--- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc
+++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_mirror.cc b/source/blender/editors/transform/transform_mode_mirror.cc
index 7f6febac2b6..698cea4497e 100644
--- a/source/blender/editors/transform/transform_mode_mirror.cc
+++ b/source/blender/editors/transform/transform_mode_mirror.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_math_bits.h"
diff --git a/source/blender/editors/transform/transform_mode_push_pull.cc b/source/blender/editors/transform/transform_mode_push_pull.cc
index f309c376692..7adb61b9c5e 100644
--- a/source/blender/editors/transform/transform_mode_push_pull.cc
+++ b/source/blender/editors/transform/transform_mode_push_pull.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_resize.cc b/source/blender/editors/transform/transform_mode_resize.cc
index 59b7a387681..5a1fddf49e3 100644
--- a/source/blender/editors/transform/transform_mode_resize.cc
+++ b/source/blender/editors/transform/transform_mode_resize.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_windowmanager_types.h"
 
diff --git a/source/blender/editors/transform/transform_mode_rotate.cc b/source/blender/editors/transform/transform_mode_rotate.cc
index a1fae59f56d..3458f12da85 100644
--- a/source/blender/editors/transform/transform_mode_rotate.cc
+++ b/source/blender/editors/transform/transform_mode_rotate.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_task.h"
diff --git a/source/blender/editors/transform/transform_mode_shear.cc b/source/blender/editors/transform/transform_mode_shear.cc
index 4ab03a1abf1..10ad426a9e4 100644
--- a/source/blender/editors/transform/transform_mode_shear.cc
+++ b/source/blender/editors/transform/transform_mode_shear.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_gpencil_legacy_types.h"
 
diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.cc b/source/blender/editors/transform/transform_mode_shrink_fatten.cc
index 64756e7eae4..036e610b55d 100644
--- a/source/blender/editors/transform/transform_mode_shrink_fatten.cc
+++ b/source/blender/editors/transform/transform_mode_shrink_fatten.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_skin_resize.cc b/source/blender/editors/transform/transform_mode_skin_resize.cc
index a6fb9ca194d..bf52a70332b 100644
--- a/source/blender/editors/transform/transform_mode_skin_resize.cc
+++ b/source/blender/editors/transform/transform_mode_skin_resize.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_task.h"
diff --git a/source/blender/editors/transform/transform_mode_tilt.cc b/source/blender/editors/transform/transform_mode_tilt.cc
index 8979614a6dd..7d27e3c38e0 100644
--- a/source/blender/editors/transform/transform_mode_tilt.cc
+++ b/source/blender/editors/transform/transform_mode_tilt.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_timescale.cc b/source/blender/editors/transform/transform_mode_timescale.cc
index cd189bd95ba..493cad54aaa 100644
--- a/source/blender/editors/transform/transform_mode_timescale.cc
+++ b/source/blender/editors/transform/transform_mode_timescale.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 
diff --git a/source/blender/editors/transform/transform_mode_timeslide.cc b/source/blender/editors/transform/transform_mode_timeslide.cc
index bdfd09c38a0..9f0f319126c 100644
--- a/source/blender/editors/transform/transform_mode_timeslide.cc
+++ b/source/blender/editors/transform/transform_mode_timeslide.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_mode_timetranslate.cc b/source/blender/editors/transform/transform_mode_timetranslate.cc
index ce63e7edae1..3a37bc7ccf7 100644
--- a/source/blender/editors/transform/transform_mode_timetranslate.cc
+++ b/source/blender/editors/transform/transform_mode_timetranslate.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 
diff --git a/source/blender/editors/transform/transform_mode_tosphere.cc b/source/blender/editors/transform/transform_mode_tosphere.cc
index b4774596843..e0026663d0a 100644
--- a/source/blender/editors/transform/transform_mode_tosphere.cc
+++ b/source/blender/editors/transform/transform_mode_tosphere.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_trackball.cc b/source/blender/editors/transform/transform_mode_trackball.cc
index 8beab26c726..88a978419f1 100644
--- a/source/blender/editors/transform/transform_mode_trackball.cc
+++ b/source/blender/editors/transform/transform_mode_trackball.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_translate.cc b/source/blender/editors/transform/transform_mode_translate.cc
index fc408461870..6bd131f14e1 100644
--- a/source/blender/editors/transform/transform_mode_translate.cc
+++ b/source/blender/editors/transform/transform_mode_translate.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc
index 62862769da8..f70f30f6c0e 100644
--- a/source/blender/editors/transform/transform_mode_vert_slide.cc
+++ b/source/blender/editors/transform/transform_mode_vert_slide.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_orientations.cc b/source/blender/editors/transform/transform_orientations.cc
index aec866632b6..96c0145872d 100644
--- a/source/blender/editors/transform/transform_orientations.cc
+++ b/source/blender/editors/transform/transform_orientations.cc
@@ -6,9 +6,9 @@
  * \ingroup edtransform
  */
 
-#include <ctype.h>
-#include <stddef.h>
-#include <string.h>
+#include <cctype>
+#include <cstddef>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/transform/transform_snap_sequencer.cc b/source/blender/editors/transform/transform_snap_sequencer.cc
index 43784b974e1..f3259968721 100644
--- a/source/blender/editors/transform/transform_snap_sequencer.cc
+++ b/source/blender/editors/transform/transform_snap_sequencer.cc
@@ -6,7 +6,7 @@
  * \ingroup edtransform
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc
index 3d8303feb4d..7fcda51bc1d 100644
--- a/source/blender/editors/undo/ed_undo.cc
+++ b/source/blender/editors/undo/ed_undo.cc
@@ -6,7 +6,7 @@
  * \ingroup edundo
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/undo/memfile_undo.cc b/source/blender/editors/undo/memfile_undo.cc
index 9c78b38c146..e1d6e78e69a 100644
--- a/source/blender/editors/undo/memfile_undo.cc
+++ b/source/blender/editors/undo/memfile_undo.cc
@@ -45,7 +45,7 @@
 
 #include "undo_intern.hh"
 
-#include <stdio.h>
+#include <cstdio>
 
 /* -------------------------------------------------------------------- */
 /** \name Implements ED Undo System
diff --git a/source/blender/editors/undo/undo_system_types.cc b/source/blender/editors/undo/undo_system_types.cc
index ef449ad2986..29452772a94 100644
--- a/source/blender/editors/undo/undo_system_types.cc
+++ b/source/blender/editors/undo/undo_system_types.cc
@@ -6,7 +6,7 @@
  * \ingroup edundo
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/editors/util/ed_draw.cc b/source/blender/editors/util/ed_draw.cc
index 16596bb320c..964b39411b8 100644
--- a/source/blender/editors/util/ed_draw.cc
+++ b/source/blender/editors/util/ed_draw.cc
@@ -6,9 +6,9 @@
  * \ingroup edutil
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/util/gizmo_utils.cc b/source/blender/editors/util/gizmo_utils.cc
index c7bd6466a30..3ba1a99a55e 100644
--- a/source/blender/editors/util/gizmo_utils.cc
+++ b/source/blender/editors/util/gizmo_utils.cc
@@ -8,7 +8,7 @@
  * \name Generic Gizmo Utilities.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/editors/util/select_utils.cc b/source/blender/editors/util/select_utils.cc
index 37bcc95ed7f..803cf257b51 100644
--- a/source/blender/editors/util/select_utils.cc
+++ b/source/blender/editors/util/select_utils.cc
@@ -6,7 +6,7 @@
  * \ingroup edutil
  */
 
-#include <float.h>
+#include <cfloat>
 
 #include "BLI_kdtree.h"
 #include "BLI_math.h"
diff --git a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
index 1003675ed67..c7498cd58e3 100644
--- a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
+++ b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
@@ -14,7 +14,7 @@
 #include "MEM_guardedalloc.h"
 
 #include <algorithm>
-#include <limits.h>
+#include <climits>
 
 #define L 0
 #define R 1
diff --git a/source/blender/gpu/intern/gpu_select_next.cc b/source/blender/gpu/intern/gpu_select_next.cc
index 0110226a93a..8de8506d96d 100644
--- a/source/blender/gpu/intern/gpu_select_next.cc
+++ b/source/blender/gpu/intern/gpu_select_next.cc
@@ -7,7 +7,7 @@
  *
  * Glue to make the new Select-Next engine work with the old GPU select API.
  */
-#include <float.h>
+#include <cfloat>
 
 #include "BLI_rect.h"
 #include "BLI_span.hh"
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.cc b/source/blender/ikplugin/intern/iksolver_plugin.cc
index 96099880bcc..aeaa247a29e 100644
--- a/source/blender/ikplugin/intern/iksolver_plugin.cc
+++ b/source/blender/ikplugin/intern/iksolver_plugin.cc
@@ -24,7 +24,7 @@
 #include "IK_solver.h"
 #include "iksolver_plugin.h"
 
-#include <string.h> /* memcpy */
+#include <cstring> /* memcpy */
 
 #define USE_NONUNIFORM_SCALE
 
diff --git a/source/blender/imbuf/intern/allocimbuf.cc b/source/blender/imbuf/intern/allocimbuf.cc
index ac09242ec6c..76190b6f9da 100644
--- a/source/blender/imbuf/intern/allocimbuf.cc
+++ b/source/blender/imbuf/intern/allocimbuf.cc
@@ -9,7 +9,7 @@
 /* It's become a bit messy... Basically, only the IMB_ prefixed files
  * should remain. */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/anim_movie.cc b/source/blender/imbuf/intern/anim_movie.cc
index bd14fedf0ca..1096e5ec054 100644
--- a/source/blender/imbuf/intern/anim_movie.cc
+++ b/source/blender/imbuf/intern/anim_movie.cc
@@ -26,11 +26,11 @@
 
 #endif
 
-#include <ctype.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <climits>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 #ifndef _WIN32
 #  include <dirent.h>
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.cc b/source/blender/imbuf/intern/cineon/cineon_dpx.cc
index 8c8a47ee02a..02952d8ab45 100644
--- a/source/blender/imbuf/intern/cineon/cineon_dpx.cc
+++ b/source/blender/imbuf/intern/cineon/cineon_dpx.cc
@@ -7,9 +7,9 @@
  */
 
 #include "logImageCore.h"
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 
 #include "IMB_filetype.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.cc b/source/blender/imbuf/intern/cineon/cineonlib.cc
index 8c82b194b1c..3d1feacfbe1 100644
--- a/source/blender/imbuf/intern/cineon/cineonlib.cc
+++ b/source/blender/imbuf/intern/cineon/cineonlib.cc
@@ -11,12 +11,12 @@
 #include "cineonlib.h"
 #include "logmemfile.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <sys/types.h>
-#include <time.h>
 
 #include "BLI_fileops.h"
 #include "BLI_string.h"
@@ -301,13 +301,13 @@ LogImageFile *cineonOpen(const uchar *byteStuff, int fromMemory, size_t bufferSi
     }
 
     if (cineon->element[i].refLowQuantity == CINEON_UNDEFINED_R32 ||
-        isnan(cineon->element[i].refLowQuantity))
+        std::isnan(cineon->element[i].refLowQuantity))
     {
       cineon->element[i].refLowQuantity = 0.0f;
     }
 
     if (cineon->element[i].refHighQuantity == CINEON_UNDEFINED_R32 ||
-        isnan(cineon->element[i].refHighQuantity))
+        std::isnan(cineon->element[i].refHighQuantity))
     {
       if (cineon->element[i].transfer == transfer_PrintingDensity) {
         cineon->element[i].refHighQuantity = 2.048f;
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.cc b/source/blender/imbuf/intern/cineon/dpxlib.cc
index 2fe58d7bcf6..d5985dce22a 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.cc
+++ b/source/blender/imbuf/intern/cineon/dpxlib.cc
@@ -11,12 +11,12 @@
 #include "dpxlib.h"
 #include "logmemfile.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <sys/types.h>
-#include <time.h>
 
 #include "BLI_fileops.h"
 #include "BLI_string.h"
diff --git a/source/blender/imbuf/intern/cineon/logImageCore.cc b/source/blender/imbuf/intern/cineon/logImageCore.cc
index 02af999a8eb..9b6c86cf989 100644
--- a/source/blender/imbuf/intern/cineon/logImageCore.cc
+++ b/source/blender/imbuf/intern/cineon/logImageCore.cc
@@ -13,9 +13,9 @@
 #include "dpxlib.h"
 #include "logmemfile.h"
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_fileops.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.cc b/source/blender/imbuf/intern/cineon/logmemfile.cc
index 2d95f1afa32..d6175339eed 100644
--- a/source/blender/imbuf/intern/cineon/logmemfile.cc
+++ b/source/blender/imbuf/intern/cineon/logmemfile.cc
@@ -8,9 +8,9 @@
  * Cineon image file format library routines.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "logImageCore.h"
 #include "logmemfile.h"
diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc
index f3d4d03a01f..1136e1b0b1f 100644
--- a/source/blender/imbuf/intern/colormanagement.cc
+++ b/source/blender/imbuf/intern/colormanagement.cc
@@ -9,8 +9,8 @@
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "DNA_color_types.h"
 #include "DNA_image_types.h"
diff --git a/source/blender/imbuf/intern/filetype.cc b/source/blender/imbuf/intern/filetype.cc
index a579048624a..8886c40fc3f 100644
--- a/source/blender/imbuf/intern/filetype.cc
+++ b/source/blender/imbuf/intern/filetype.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/imbuf/intern/filter.cc b/source/blender/imbuf/intern/filter.cc
index 6fc3b273658..d40f844601f 100644
--- a/source/blender/imbuf/intern/filter.cc
+++ b/source/blender/imbuf/intern/filter.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/imbuf/intern/imageprocess.cc b/source/blender/imbuf/intern/imageprocess.cc
index ceb11fe4183..694a1fcf22a 100644
--- a/source/blender/imbuf/intern/imageprocess.cc
+++ b/source/blender/imbuf/intern/imageprocess.cc
@@ -11,8 +11,8 @@
  * It should probably move to `imbuf/intern/util.c`, but we'll keep it here for the time being.
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/imbuf/intern/indexer.cc b/source/blender/imbuf/intern/indexer.cc
index 4f29691c38c..240021cc3f5 100644
--- a/source/blender/imbuf/intern/indexer.cc
+++ b/source/blender/imbuf/intern/indexer.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/imbuf/intern/iris.cc b/source/blender/imbuf/intern/iris.cc
index ee50c7b3712..6f21b4f992b 100644
--- a/source/blender/imbuf/intern/iris.cc
+++ b/source/blender/imbuf/intern/iris.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "BLI_fileops.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/imbuf/intern/jpeg.cc b/source/blender/imbuf/intern/jpeg.cc
index 1f1092394e4..1608b1d3334 100644
--- a/source/blender/imbuf/intern/jpeg.cc
+++ b/source/blender/imbuf/intern/jpeg.cc
@@ -7,8 +7,8 @@
  */
 
 /* This little block needed for linking to Blender... */
-#include <setjmp.h>
-#include <stdio.h>
+#include <csetjmp>
+#include <cstdio>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/imbuf/intern/metadata.cc b/source/blender/imbuf/intern/metadata.cc
index f88954f417b..c99a4c27cdf 100644
--- a/source/blender/imbuf/intern/metadata.cc
+++ b/source/blender/imbuf/intern/metadata.cc
@@ -6,8 +6,8 @@
  * \ingroup imbuf
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
diff --git a/source/blender/imbuf/intern/module.cc b/source/blender/imbuf/intern/module.cc
index 37b86093b25..0e69ef33b78 100644
--- a/source/blender/imbuf/intern/module.cc
+++ b/source/blender/imbuf/intern/module.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/imbuf/intern/readimage.cc b/source/blender/imbuf/intern/readimage.cc
index bb3d7604019..6551af058f5 100644
--- a/source/blender/imbuf/intern/readimage.cc
+++ b/source/blender/imbuf/intern/readimage.cc
@@ -17,7 +17,7 @@
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"
diff --git a/source/blender/imbuf/intern/rectop.cc b/source/blender/imbuf/intern/rectop.cc
index d896728a9a0..a72342bebf9 100644
--- a/source/blender/imbuf/intern/rectop.cc
+++ b/source/blender/imbuf/intern/rectop.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math_base.h"
 #include "BLI_math_color.h"
diff --git a/source/blender/imbuf/intern/scaling.cc b/source/blender/imbuf/intern/scaling.cc
index 84e87e6ce63..8780aa96c18 100644
--- a/source/blender/imbuf/intern/scaling.cc
+++ b/source/blender/imbuf/intern/scaling.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "BLI_math_color.h"
 #include "BLI_math_interp.h"
diff --git a/source/blender/imbuf/intern/stereoimbuf.cc b/source/blender/imbuf/intern/stereoimbuf.cc
index 49deb74a9be..339ab836689 100644
--- a/source/blender/imbuf/intern/stereoimbuf.cc
+++ b/source/blender/imbuf/intern/stereoimbuf.cc
@@ -6,7 +6,7 @@
  * \ingroup imbuf
  */
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/thumbs.cc b/source/blender/imbuf/intern/thumbs.cc
index e025ff0dd3f..1cf68473f36 100644
--- a/source/blender/imbuf/intern/thumbs.cc
+++ b/source/blender/imbuf/intern/thumbs.cc
@@ -6,8 +6,8 @@
  * \ingroup imbuf
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
@@ -31,11 +31,11 @@
 #include "IMB_metadata.h"
 #include "IMB_thumbs.h"
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
+#include <ctime>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <time.h>
 
 #ifdef WIN32
 /* Need to include windows.h so _WIN32_IE is defined. */
diff --git a/source/blender/imbuf/intern/thumbs_blend.cc b/source/blender/imbuf/intern/thumbs_blend.cc
index e3b19e2f17c..ff6167e8348 100644
--- a/source/blender/imbuf/intern/thumbs_blend.cc
+++ b/source/blender/imbuf/intern/thumbs_blend.cc
@@ -6,9 +6,9 @@
  * \ingroup imbuf
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_linklist.h"
 #include "BLI_listbase.h" /* Needed due to import of BLO_readfile.h */
diff --git a/source/blender/imbuf/intern/util.cc b/source/blender/imbuf/intern/util.cc
index 09c48923f18..d085d165a58 100644
--- a/source/blender/imbuf/intern/util.cc
+++ b/source/blender/imbuf/intern/util.cc
@@ -10,7 +10,7 @@
 #  include <io.h>
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
diff --git a/source/blender/imbuf/intern/writeimage.cc b/source/blender/imbuf/intern/writeimage.cc
index 21bdaea8997..07aa014c0e5 100644
--- a/source/blender/imbuf/intern/writeimage.cc
+++ b/source/blender/imbuf/intern/writeimage.cc
@@ -6,9 +6,9 @@
  * \ingroup imbuf
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_path_util.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/io/ply/importer/ply_import_buffer.cc b/source/blender/io/ply/importer/ply_import_buffer.cc
index d5ab4dc9aff..aabc3a674bc 100644
--- a/source/blender/io/ply/importer/ply_import_buffer.cc
+++ b/source/blender/io/ply/importer/ply_import_buffer.cc
@@ -6,7 +6,7 @@
 
 #include "BLI_fileops.h"
 
-#include <string.h>
+#include <cstring>
 
 static inline bool is_newline(char ch)
 {
diff --git a/source/blender/makesdna/intern/dna_genfile.cc b/source/blender/makesdna/intern/dna_genfile.cc
index 527adc87528..6da9a297ab9 100644
--- a/source/blender/makesdna/intern/dna_genfile.cc
+++ b/source/blender/makesdna/intern/dna_genfile.cc
@@ -12,10 +12,10 @@
  * SDNA and the SDNA of the current (running) version of Blender.
  */
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h" /* for MEM_freeN MEM_mallocN MEM_callocN */
 
diff --git a/source/blender/makesdna/intern/dna_utils.cc b/source/blender/makesdna/intern/dna_utils.cc
index d74b036bd4a..c18dd93223e 100644
--- a/source/blender/makesdna/intern/dna_utils.cc
+++ b/source/blender/makesdna/intern/dna_utils.cc
@@ -8,7 +8,7 @@
  * Utilities for stand-alone `makesdna.cc` and Blender to share.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesdna/intern/makesdna.cc b/source/blender/makesdna/intern/makesdna.cc
index f00f8518249..9e749319673 100644
--- a/source/blender/makesdna/intern/makesdna.cc
+++ b/source/blender/makesdna/intern/makesdna.cc
@@ -26,10 +26,10 @@
 
 #define DNA_DEPRECATED_ALLOW
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/makesrna.cc b/source/blender/makesrna/intern/makesrna.cc
index f9b51cc6914..60fe0c75705 100644
--- a/source/blender/makesrna/intern/makesrna.cc
+++ b/source/blender/makesrna/intern/makesrna.cc
@@ -6,14 +6,14 @@
  * \ingroup RNA
  */
 
-#include <errno.h>
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cfloat>
+#include <cinttypes>
+#include <climits>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc
index 264f84d912a..77178936bdb 100644
--- a/source/blender/makesrna/intern/rna_ID.cc
+++ b/source/blender/makesrna/intern/rna_ID.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_ID.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.cc b/source/blender/makesrna/intern/rna_access_compare_override.cc
index e67982db130..a2f316e2d94 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.cc
+++ b/source/blender/makesrna/intern/rna_access_compare_override.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <string.h>
+#include <cstring>
 
 #include <CLG_log.h>
 
diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc
index 0080bd76d19..48d844cf8d0 100644
--- a/source/blender/makesrna/intern/rna_action.cc
+++ b/source/blender/makesrna/intern/rna_action.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
diff --git a/source/blender/makesrna/intern/rna_action_api.cc b/source/blender/makesrna/intern/rna_action_api.cc
index 16cd627270d..376045b134c 100644
--- a/source/blender/makesrna/intern/rna_action_api.cc
+++ b/source/blender/makesrna/intern/rna_action_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc
index a354dd8a12d..47abe6e61fb 100644
--- a/source/blender/makesrna/intern/rna_animation.cc
+++ b/source/blender/makesrna/intern/rna_animation.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
diff --git a/source/blender/makesrna/intern/rna_animation_api.cc b/source/blender/makesrna/intern/rna_animation_api.cc
index f7aa388daf4..7e06d4fb9d9 100644
--- a/source/blender/makesrna/intern/rna_animation_api.cc
+++ b/source/blender/makesrna/intern/rna_animation_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_animviz.cc b/source/blender/makesrna/intern/rna_animviz.cc
index 103befea193..c4a8fa496ac 100644
--- a/source/blender/makesrna/intern/rna_animviz.cc
+++ b/source/blender/makesrna/intern/rna_animviz.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc
index 4c8d98454f9..18798f22630 100644
--- a/source/blender/makesrna/intern/rna_armature.cc
+++ b/source/blender/makesrna/intern/rna_armature.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_string_utf8_symbols.h"
diff --git a/source/blender/makesrna/intern/rna_armature_api.cc b/source/blender/makesrna/intern/rna_armature_api.cc
index 9bf07221d7c..99e611973a9 100644
--- a/source/blender/makesrna/intern/rna_armature_api.cc
+++ b/source/blender/makesrna/intern/rna_armature_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_asset.cc b/source/blender/makesrna/intern/rna_asset.cc
index 8fa7a51e0f2..089f17d1608 100644
--- a/source/blender/makesrna/intern/rna_asset.cc
+++ b/source/blender/makesrna/intern/rna_asset.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_attribute.cc b/source/blender/makesrna/intern/rna_attribute.cc
index 82472324a3b..3faefcaf256 100644
--- a/source/blender/makesrna/intern/rna_attribute.cc
+++ b/source/blender/makesrna/intern/rna_attribute.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_boid.cc b/source/blender/makesrna/intern/rna_boid.cc
index dd9fe1883af..240ad8db7e5 100644
--- a/source/blender/makesrna/intern/rna_boid.cc
+++ b/source/blender/makesrna/intern/rna_boid.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_boid_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc
index 04073c1d9b6..841eed3a2a1 100644
--- a/source/blender/makesrna/intern/rna_brush.cc
+++ b/source/blender/makesrna/intern/rna_brush.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_brush_types.h"
 #include "DNA_gpencil_legacy_types.h"
diff --git a/source/blender/makesrna/intern/rna_camera.cc b/source/blender/makesrna/intern/rna_camera.cc
index 882c3187e20..8ef5d426467 100644
--- a/source/blender/makesrna/intern/rna_camera.cc
+++ b/source/blender/makesrna/intern/rna_camera.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_camera_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_camera_api.cc b/source/blender/makesrna/intern/rna_camera_api.cc
index 5089fd697c1..951b556bd8e 100644
--- a/source/blender/makesrna/intern/rna_camera_api.cc
+++ b/source/blender/makesrna/intern/rna_camera_api.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_cloth.cc b/source/blender/makesrna/intern/rna_cloth.cc
index 821625e968b..d15b32eb2e9 100644
--- a/source/blender/makesrna/intern/rna_cloth.cc
+++ b/source/blender/makesrna/intern/rna_cloth.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_cloth_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_collection.cc b/source/blender/makesrna/intern/rna_collection.cc
index 2af99ee7ea8..32f4b7f168d 100644
--- a/source/blender/makesrna/intern/rna_collection.cc
+++ b/source/blender/makesrna/intern/rna_collection.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_collection_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc
index 2fc9388cfbb..71097ead7f7 100644
--- a/source/blender/makesrna/intern/rna_color.cc
+++ b/source/blender/makesrna/intern/rna_color.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_color_types.h"
 #include "DNA_texture_types.h"
diff --git a/source/blender/makesrna/intern/rna_constraint.cc b/source/blender/makesrna/intern/rna_constraint.cc
index f7f55f7e358..1765d099ad8 100644
--- a/source/blender/makesrna/intern/rna_constraint.cc
+++ b/source/blender/makesrna/intern/rna_constraint.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 
diff --git a/source/blender/makesrna/intern/rna_context.cc b/source/blender/makesrna/intern/rna_context.cc
index 8acfaf14ac2..92c0efacfa6 100644
--- a/source/blender/makesrna/intern/rna_context.cc
+++ b/source/blender/makesrna/intern/rna_context.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_ID.h"
 #include "DNA_userdef_types.h"
diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc
index 541f848ae07..b5f7b115142 100644
--- a/source/blender/makesrna/intern/rna_curve.cc
+++ b/source/blender/makesrna/intern/rna_curve.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
diff --git a/source/blender/makesrna/intern/rna_curve_api.cc b/source/blender/makesrna/intern/rna_curve_api.cc
index a3e6d404f13..333a9bbda40 100644
--- a/source/blender/makesrna/intern/rna_curve_api.cc
+++ b/source/blender/makesrna/intern/rna_curve_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_curveprofile.cc b/source/blender/makesrna/intern/rna_curveprofile.cc
index 49ab917995b..d77f15b7e8b 100644
--- a/source/blender/makesrna/intern/rna_curveprofile.cc
+++ b/source/blender/makesrna/intern/rna_curveprofile.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_curve_types.h"
 #include "DNA_curveprofile_types.h"
diff --git a/source/blender/makesrna/intern/rna_curves.cc b/source/blender/makesrna/intern/rna_curves.cc
index c546b127853..213c9c3c5a1 100644
--- a/source/blender/makesrna/intern/rna_curves.cc
+++ b/source/blender/makesrna/intern/rna_curves.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_define.cc b/source/blender/makesrna/intern/rna_define.cc
index fad16547c4d..fa862c21e3f 100644
--- a/source/blender/makesrna/intern/rna_define.cc
+++ b/source/blender/makesrna/intern/rna_define.cc
@@ -6,13 +6,13 @@
  * \ingroup RNA
  */
 
-#include <ctype.h>
-#include <float.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/makesrna/intern/rna_depsgraph.cc b/source/blender/makesrna/intern/rna_depsgraph.cc
index 8ee8894b7ba..5009347cb3d 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.cc
+++ b/source/blender/makesrna/intern/rna_depsgraph.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_path_util.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.cc b/source/blender/makesrna/intern/rna_dynamicpaint.cc
index fbff19daf6d..ccdc6e18953 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.cc
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "BKE_dynamicpaint.h"
 #include "BKE_modifier.h"
diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc
index dd118754d45..b20a8a857b6 100644
--- a/source/blender/makesrna/intern/rna_fcurve.cc
+++ b/source/blender/makesrna/intern/rna_fcurve.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/makesrna/intern/rna_fcurve_api.cc b/source/blender/makesrna/intern/rna_fcurve_api.cc
index d8628160b91..a538f48fcb7 100644
--- a/source/blender/makesrna/intern/rna_fcurve_api.cc
+++ b/source/blender/makesrna/intern/rna_fcurve_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_fluid.cc b/source/blender/makesrna/intern/rna_fluid.cc
index 1034cbbda6d..2a0b1fbddd0 100644
--- a/source/blender/makesrna/intern/rna_fluid.cc
+++ b/source/blender/makesrna/intern/rna_fluid.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "BLI_path_util.h"
 #include "BLI_sys_types.h"
diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy.cc b/source/blender/makesrna/intern/rna_gpencil_legacy.cc
index be24aa48f94..dfe6f888de1 100644
--- a/source/blender/makesrna/intern/rna_gpencil_legacy.cc
+++ b/source/blender/makesrna/intern/rna_gpencil_legacy.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
index 9d7ffb8e08c..5a316a3e763 100644
--- a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
+++ b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_armature_types.h"
 #include "DNA_gpencil_legacy_types.h"
diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc
index 82007630081..40ea4409b71 100644
--- a/source/blender/makesrna/intern/rna_image.cc
+++ b/source/blender/makesrna/intern/rna_image.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_image_types.h"
 #include "DNA_node_types.h"
diff --git a/source/blender/makesrna/intern/rna_image_api.cc b/source/blender/makesrna/intern/rna_image_api.cc
index df0db5deaa8..b3b345c5224 100644
--- a/source/blender/makesrna/intern/rna_image_api.cc
+++ b/source/blender/makesrna/intern/rna_image_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "DNA_packedFile_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_key.cc b/source/blender/makesrna/intern/rna_key.cc
index a767090c498..d975004b1bd 100644
--- a/source/blender/makesrna/intern/rna_key.cc
+++ b/source/blender/makesrna/intern/rna_key.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_ID.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/makesrna/intern/rna_lattice.cc b/source/blender/makesrna/intern/rna_lattice.cc
index 3ae11775750..c46eddb31e5 100644
--- a/source/blender/makesrna/intern/rna_lattice.cc
+++ b/source/blender/makesrna/intern/rna_lattice.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
diff --git a/source/blender/makesrna/intern/rna_lattice_api.cc b/source/blender/makesrna/intern/rna_lattice_api.cc
index c4328e7a325..b328d355132 100644
--- a/source/blender/makesrna/intern/rna_lattice_api.cc
+++ b/source/blender/makesrna/intern/rna_lattice_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_light.cc b/source/blender/makesrna/intern/rna_light.cc
index 6554c0b6e72..6eeea625cf7 100644
--- a/source/blender/makesrna/intern/rna_light.cc
+++ b/source/blender/makesrna/intern/rna_light.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
diff --git a/source/blender/makesrna/intern/rna_lightprobe.cc b/source/blender/makesrna/intern/rna_lightprobe.cc
index b65c8e8b1a9..717f8980efc 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.cc
+++ b/source/blender/makesrna/intern/rna_lightprobe.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_linestyle.cc b/source/blender/makesrna/intern/rna_linestyle.cc
index 0556c204117..8018b37d779 100644
--- a/source/blender/makesrna/intern/rna_linestyle.cc
+++ b/source/blender/makesrna/intern/rna_linestyle.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_main.cc b/source/blender/makesrna/intern/rna_main.cc
index 72081bad9d5..889a1c3f136 100644
--- a/source/blender/makesrna/intern/rna_main.cc
+++ b/source/blender/makesrna/intern/rna_main.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_path_util.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc
index 8635c26470d..12ddfb63982 100644
--- a/source/blender/makesrna/intern/rna_main_api.cc
+++ b/source/blender/makesrna/intern/rna_main_api.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_ID.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/makesrna/intern/rna_mask.cc b/source/blender/makesrna/intern/rna_mask.cc
index 4ce6023e4e6..d1d336bf6cb 100644
--- a/source/blender/makesrna/intern/rna_mask.cc
+++ b/source/blender/makesrna/intern/rna_mask.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc
index 6dc98724563..c91bfab3743 100644
--- a/source/blender/makesrna/intern/rna_material.cc
+++ b/source/blender/makesrna/intern/rna_material.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <cstdlib>
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/makesrna/intern/rna_material_api.cc b/source/blender/makesrna/intern/rna_material_api.cc
index afe0607d19d..6f6940499fe 100644
--- a/source/blender/makesrna/intern/rna_material_api.cc
+++ b/source/blender/makesrna/intern/rna_material_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_meta.cc b/source/blender/makesrna/intern/rna_meta.cc
index cc0d0d201bc..0232b891aa8 100644
--- a/source/blender/makesrna/intern/rna_meta.cc
+++ b/source/blender/makesrna/intern/rna_meta.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
diff --git a/source/blender/makesrna/intern/rna_meta_api.cc b/source/blender/makesrna/intern/rna_meta_api.cc
index 358e7ae1c22..92c3a336a56 100644
--- a/source/blender/makesrna/intern/rna_meta_api.cc
+++ b/source/blender/makesrna/intern/rna_meta_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc
index 97faa97f509..496b665a98b 100644
--- a/source/blender/makesrna/intern/rna_modifier.cc
+++ b/source/blender/makesrna/intern/rna_modifier.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_armature_types.h"
 #include "DNA_cachefile_types.h"
diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc
index 6704d1f6c14..a76e0f2add1 100644
--- a/source/blender/makesrna/intern/rna_movieclip.cc
+++ b/source/blender/makesrna/intern/rna_movieclip.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_nla.cc b/source/blender/makesrna/intern/rna_nla.cc
index 236ae9b7d90..233afd4c6eb 100644
--- a/source/blender/makesrna/intern/rna_nla.cc
+++ b/source/blender/makesrna/intern/rna_nla.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc
index 9992f7219dd..03572c1cf40 100644
--- a/source/blender/makesrna/intern/rna_nodetree.cc
+++ b/source/blender/makesrna/intern/rna_nodetree.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_function_ref.hh"
 #include "BLI_math.h"
diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc
index 3563b3a47dd..a99fceb534d 100644
--- a/source/blender/makesrna/intern/rna_object.cc
+++ b/source/blender/makesrna/intern/rna_object.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_action_types.h"
 #include "DNA_brush_types.h"
diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc
index 4dd100e88f9..2c4a41d57cb 100644
--- a/source/blender/makesrna/intern/rna_object_api.cc
+++ b/source/blender/makesrna/intern/rna_object_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "BLI_kdopbvh.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_object_force.cc b/source/blender/makesrna/intern/rna_object_force.cc
index 6499fdec333..8a0ea12aa29 100644
--- a/source/blender/makesrna/intern/rna_object_force.cc
+++ b/source/blender/makesrna/intern/rna_object_force.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_packedfile.cc b/source/blender/makesrna/intern/rna_packedfile.cc
index 931966b88e2..9019bdffd12 100644
--- a/source/blender/makesrna/intern/rna_packedfile.cc
+++ b/source/blender/makesrna/intern/rna_packedfile.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_palette.cc b/source/blender/makesrna/intern/rna_palette.cc
index a396abaf04a..3ec65611cd7 100644
--- a/source/blender/makesrna/intern/rna_palette.cc
+++ b/source/blender/makesrna/intern/rna_palette.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc
index c83b6a8055b..38d4585c80b 100644
--- a/source/blender/makesrna/intern/rna_particle.cc
+++ b/source/blender/makesrna/intern/rna_particle.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_boid_types.h"
 #include "DNA_cloth_types.h"
diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc
index eeb794e71ad..79737e86a79 100644
--- a/source/blender/makesrna/intern/rna_path.cc
+++ b/source/blender/makesrna/intern/rna_path.cc
@@ -7,8 +7,7 @@
  */
 
 #include <cstdlib>
-#include <stdlib.h>
-#include <string.h>
+#include <cstring>
 
 #include "BLI_alloca.h"
 #include "BLI_dynstr.h"
diff --git a/source/blender/makesrna/intern/rna_pointcloud.cc b/source/blender/makesrna/intern/rna_pointcloud.cc
index a7bfdeb08ac..64f680d04bc 100644
--- a/source/blender/makesrna/intern/rna_pointcloud.cc
+++ b/source/blender/makesrna/intern/rna_pointcloud.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc
index 184716169c5..baab4bf43b5 100644
--- a/source/blender/makesrna/intern/rna_pose.cc
+++ b/source/blender/makesrna/intern/rna_pose.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_pose_api.cc b/source/blender/makesrna/intern/rna_pose_api.cc
index 5c4daee9b12..e1e2ac0b456 100644
--- a/source/blender/makesrna/intern/rna_pose_api.cc
+++ b/source/blender/makesrna/intern/rna_pose_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc
index 253b0f6213d..7e0e3a8e0ef 100644
--- a/source/blender/makesrna/intern/rna_render.cc
+++ b/source/blender/makesrna/intern/rna_render.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_rigidbody.cc b/source/blender/makesrna/intern/rna_rigidbody.cc
index 43399577d3f..0c1b3f55586 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.cc
+++ b/source/blender/makesrna/intern/rna_rigidbody.cc
@@ -7,8 +7,8 @@
  * \brief RNA property definitions for Rigid Body datatypes
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_rna.cc b/source/blender/makesrna/intern/rna_rna.cc
index b52ad757786..4d906cd6026 100644
--- a/source/blender/makesrna/intern/rna_rna.cc
+++ b/source/blender/makesrna/intern/rna_rna.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <CLG_log.h>
 
diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc
index 4aa90fa83de..c26afe5f3b5 100644
--- a/source/blender/makesrna/intern/rna_scene.cc
+++ b/source/blender/makesrna/intern/rna_scene.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_brush_types.h"
 #include "DNA_collection_types.h"
diff --git a/source/blender/makesrna/intern/rna_scene_api.cc b/source/blender/makesrna/intern/rna_scene_api.cc
index dbe53b9a04b..d476fd84fe7 100644
--- a/source/blender/makesrna/intern/rna_scene_api.cc
+++ b/source/blender/makesrna/intern/rna_scene_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_kdopbvh.h"
 #include "BLI_path_util.h"
diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc
index a045feb292b..15f78fce4ad 100644
--- a/source/blender/makesrna/intern/rna_screen.cc
+++ b/source/blender/makesrna/intern/rna_screen.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc
index 0f085eb21e7..e14634264b2 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.cc
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc
index b56cc00b8a2..866f142ed99 100644
--- a/source/blender/makesrna/intern/rna_sequencer.cc
+++ b/source/blender/makesrna/intern/rna_sequencer.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_anim_types.h"
 #include "DNA_movieclip_types.h"
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.cc b/source/blender/makesrna/intern/rna_sequencer_api.cc
index b58e492c43e..7650489d010 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.cc
+++ b/source/blender/makesrna/intern/rna_sequencer_api.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
diff --git a/source/blender/makesrna/intern/rna_shader_fx.cc b/source/blender/makesrna/intern/rna_shader_fx.cc
index b704a5d1ba3..50f6d2ef632 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.cc
+++ b/source/blender/makesrna/intern/rna_shader_fx.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_sound.cc b/source/blender/makesrna/intern/rna_sound.cc
index 3028de9befc..5de9ae716e4 100644
--- a/source/blender/makesrna/intern/rna_sound.cc
+++ b/source/blender/makesrna/intern/rna_sound.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc
index 113ca0ee112..f9d371445c8 100644
--- a/source/blender/makesrna/intern/rna_space.cc
+++ b/source/blender/makesrna/intern/rna_space.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_speaker.cc b/source/blender/makesrna/intern/rna_speaker.cc
index 3d75f70d4d0..2d20102ff7e 100644
--- a/source/blender/makesrna/intern/rna_speaker.cc
+++ b/source/blender/makesrna/intern/rna_speaker.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_text.cc b/source/blender/makesrna/intern/rna_text.cc
index 8e78791d907..ce91c98ff03 100644
--- a/source/blender/makesrna/intern/rna_text.cc
+++ b/source/blender/makesrna/intern/rna_text.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_text_api.cc b/source/blender/makesrna/intern/rna_text_api.cc
index 49d85cd8746..7c8ce2c106d 100644
--- a/source/blender/makesrna/intern/rna_text_api.cc
+++ b/source/blender/makesrna/intern/rna_text_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_texture.cc b/source/blender/makesrna/intern/rna_texture.cc
index fda00eed211..106fff3dd0b 100644
--- a/source/blender/makesrna/intern/rna_texture.cc
+++ b/source/blender/makesrna/intern/rna_texture.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <cstdio>
+#include <cstdlib>
 
 #include "DNA_brush_types.h"
 #include "DNA_light_types.h"
diff --git a/source/blender/makesrna/intern/rna_texture_api.cc b/source/blender/makesrna/intern/rna_texture_api.cc
index 1453f7f0af8..46d6a70a1f8 100644
--- a/source/blender/makesrna/intern/rna_texture_api.cc
+++ b/source/blender/makesrna/intern/rna_texture_api.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_timeline.cc b/source/blender/makesrna/intern/rna_timeline.cc
index 55e8e353c7a..daf8a873895 100644
--- a/source/blender/makesrna/intern/rna_timeline.cc
+++ b/source/blender/makesrna/intern/rna_timeline.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_tracking.cc b/source/blender/makesrna/intern/rna_tracking.cc
index 9fcd6b10220..d8c36c088a1 100644
--- a/source/blender/makesrna/intern/rna_tracking.cc
+++ b/source/blender/makesrna/intern/rna_tracking.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc
index 2f04bb14b40..87c0e44aa37 100644
--- a/source/blender/makesrna/intern/rna_ui.cc
+++ b/source/blender/makesrna/intern/rna_ui.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/makesrna/intern/rna_ui_api.cc b/source/blender/makesrna/intern/rna_ui_api.cc
index 6997e4dae19..1b775cd6a72 100644
--- a/source/blender/makesrna/intern/rna_ui_api.cc
+++ b/source/blender/makesrna/intern/rna_ui_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc
index 9a14eae2f4c..9ddaf324eec 100644
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 
 #include "DNA_brush_types.h"
 #include "DNA_curve_types.h"
diff --git a/source/blender/makesrna/intern/rna_vfont.cc b/source/blender/makesrna/intern/rna_vfont.cc
index 849974c1ca7..ba10919d721 100644
--- a/source/blender/makesrna/intern/rna_vfont.cc
+++ b/source/blender/makesrna/intern/rna_vfont.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_volume.cc b/source/blender/makesrna/intern/rna_volume.cc
index 4cbd1e6a3e0..f92d91abb34 100644
--- a/source/blender/makesrna/intern/rna_volume.cc
+++ b/source/blender/makesrna/intern/rna_volume.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc
index 95f37a660a5..fb3846c7513 100644
--- a/source/blender/makesrna/intern/rna_wm.cc
+++ b/source/blender/makesrna/intern/rna_wm.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/makesrna/intern/rna_wm_api.cc b/source/blender/makesrna/intern/rna_wm_api.cc
index 738911f8a53..dd11c8be68a 100644
--- a/source/blender/makesrna/intern/rna_wm_api.cc
+++ b/source/blender/makesrna/intern/rna_wm_api.cc
@@ -6,9 +6,9 @@
  * \ingroup RNA
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.cc b/source/blender/makesrna/intern/rna_wm_gizmo.cc
index 74fd1642a45..2d0a446b22e 100644
--- a/source/blender/makesrna/intern/rna_wm_gizmo.cc
+++ b/source/blender/makesrna/intern/rna_wm_gizmo.cc
@@ -6,7 +6,7 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc
index ab88069d3b6..ce80c984bd4 100644
--- a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc
+++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_workspace_api.cc b/source/blender/makesrna/intern/rna_workspace_api.cc
index f3ab52ffdf8..3cb2a9250d4 100644
--- a/source/blender/makesrna/intern/rna_workspace_api.cc
+++ b/source/blender/makesrna/intern/rna_workspace_api.cc
@@ -6,10 +6,10 @@
  * \ingroup RNA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_world.cc b/source/blender/makesrna/intern/rna_world.cc
index bc95384e94a..28edcb5ffc4 100644
--- a/source/blender/makesrna/intern/rna_world.cc
+++ b/source/blender/makesrna/intern/rna_world.cc
@@ -6,8 +6,8 @@
  * \ingroup RNA
  */
 
-#include <float.h>
-#include <stdlib.h>
+#include <cfloat>
+#include <cstdlib>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.cc b/source/blender/nodes/texture/nodes/node_texture_distance.cc
index 303afa12572..f2559747bdc 100644
--- a/source/blender/nodes/texture/nodes/node_texture_distance.cc
+++ b/source/blender/nodes/texture/nodes/node_texture_distance.cc
@@ -8,7 +8,7 @@
 
 #include "NOD_texture.h"
 #include "node_texture_util.hh"
-#include <math.h>
+#include <cmath>
 
 static bNodeSocketTemplate inputs[] = {
     {SOCK_VECTOR, N_("Coordinate 1"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE},
diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.cc b/source/blender/nodes/texture/nodes/node_texture_translate.cc
index ee6116750ad..d9c2176da2e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_translate.cc
+++ b/source/blender/nodes/texture/nodes/node_texture_translate.cc
@@ -8,7 +8,7 @@
 
 #include "NOD_texture.h"
 #include "node_texture_util.hh"
-#include <math.h>
+#include <cmath>
 
 static bNodeSocketTemplate inputs[] = {
     {SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.cc b/source/blender/nodes/texture/nodes/node_texture_viewer.cc
index b63f98b6dff..42964e291b6 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.cc
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.cc
@@ -8,7 +8,7 @@
 
 #include "NOD_texture.h"
 #include "node_texture_util.hh"
-#include <math.h>
+#include <cmath>
 
 static bNodeSocketTemplate inputs[] = {
     {SOCK_RGBA, N_("Color"), 1.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/python/generic/imbuf_py_api.cc b/source/blender/python/generic/imbuf_py_api.cc
index cbbc78669dc..cdbd5d49656 100644
--- a/source/blender/python/generic/imbuf_py_api.cc
+++ b/source/blender/python/generic/imbuf_py_api.cc
@@ -25,7 +25,7 @@
 
 /* File IO */
 #include "BLI_fileops.h"
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 
 static PyObject *BPyInit_imbuf_types(void);
diff --git a/source/blender/python/generic/py_capi_rna.cc b/source/blender/python/generic/py_capi_rna.cc
index 240b2ebaacb..73e4da0631d 100644
--- a/source/blender/python/generic/py_capi_rna.cc
+++ b/source/blender/python/generic/py_capi_rna.cc
@@ -14,7 +14,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include <Python.h>
-#include <stdbool.h>
 
 #include "py_capi_rna.h"
 
diff --git a/source/blender/sequencer/intern/animation.cc b/source/blender/sequencer/intern/animation.cc
index 558bbd902a6..17a3aea3cbc 100644
--- a/source/blender/sequencer/intern/animation.cc
+++ b/source/blender/sequencer/intern/animation.cc
@@ -6,7 +6,7 @@
  * \ingroup sequencer
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/sequencer/intern/channels.cc b/source/blender/sequencer/intern/channels.cc
index 27db1ebfc14..748347e9d07 100644
--- a/source/blender/sequencer/intern/channels.cc
+++ b/source/blender/sequencer/intern/channels.cc
@@ -6,7 +6,7 @@
  * \ingroup sequencer
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/clipboard.cc b/source/blender/sequencer/intern/clipboard.cc
index 149a007420a..fd054670e75 100644
--- a/source/blender/sequencer/intern/clipboard.cc
+++ b/source/blender/sequencer/intern/clipboard.cc
@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/disk_cache.cc b/source/blender/sequencer/intern/disk_cache.cc
index 0693b88cf4b..7ef1cf7d56f 100644
--- a/source/blender/sequencer/intern/disk_cache.cc
+++ b/source/blender/sequencer/intern/disk_cache.cc
@@ -6,9 +6,9 @@
  * \ingroup sequencer
  */
 
+#include <cstddef>
+#include <ctime>
 #include <memory.h>
-#include <stddef.h>
-#include <time.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc
index 423f5023e68..d7299ab4495 100644
--- a/source/blender/sequencer/intern/effects.cc
+++ b/source/blender/sequencer/intern/effects.cc
@@ -8,9 +8,9 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/image_cache.cc b/source/blender/sequencer/intern/image_cache.cc
index 8edd9b51a61..e6b803cdc45 100644
--- a/source/blender/sequencer/intern/image_cache.cc
+++ b/source/blender/sequencer/intern/image_cache.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
+#include <cstddef>
+#include <ctime>
 #include <memory.h>
-#include <stddef.h>
-#include <time.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/iterator.cc b/source/blender/sequencer/intern/iterator.cc
index cb53c919f6b..c9c7d1d80a8 100644
--- a/source/blender/sequencer/intern/iterator.cc
+++ b/source/blender/sequencer/intern/iterator.cc
@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/modifier.cc b/source/blender/sequencer/intern/modifier.cc
index 28498cff5e4..601a9e240bf 100644
--- a/source/blender/sequencer/intern/modifier.cc
+++ b/source/blender/sequencer/intern/modifier.cc
@@ -6,8 +6,8 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <string.h>
+#include <cstddef>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc
index 91fcfa49282..787d7f533f9 100644
--- a/source/blender/sequencer/intern/prefetch.cc
+++ b/source/blender/sequencer/intern/prefetch.cc
@@ -6,9 +6,9 @@
  * \ingroup bke
  */
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc
index 2b657395578..9e7f4688e26 100644
--- a/source/blender/sequencer/intern/render.cc
+++ b/source/blender/sequencer/intern/render.cc
@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include <time.h>
+#include <ctime>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/sequence_lookup.cc b/source/blender/sequencer/intern/sequence_lookup.cc
index b10087e9aed..8a59aec0571 100644
--- a/source/blender/sequencer/intern/sequence_lookup.cc
+++ b/source/blender/sequencer/intern/sequence_lookup.cc
@@ -20,7 +20,7 @@
 #include "BLI_string.h"
 #include "BLI_sys_types.h"
 #include "BLI_threads.h"
-#include <string.h>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/sound.cc b/source/blender/sequencer/intern/sound.cc
index 44702379f62..db522735db3 100644
--- a/source/blender/sequencer/intern/sound.cc
+++ b/source/blender/sequencer/intern/sound.cc
@@ -8,7 +8,7 @@
  * \ingroup bke
  */
 
-#include <math.h>
+#include <cmath>
 
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc
index f9ea7d8e8aa..b45ad513e19 100644
--- a/source/blender/sequencer/intern/strip_add.cc
+++ b/source/blender/sequencer/intern/strip_add.cc
@@ -8,8 +8,8 @@
  * \ingroup bke
  */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/sequencer/intern/utils.cc b/source/blender/sequencer/intern/utils.cc
index 2215175183a..9e4db4f049c 100644
--- a/source/blender/sequencer/intern/utils.cc
+++ b/source/blender/sequencer/intern/utils.cc
@@ -8,8 +8,8 @@
  * \ingroup bke
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc
index ba18ffe4caa..6df4d50f6e9 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.cc
+++ b/source/blender/shader_fx/intern/FX_shader_blur.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.cc b/source/blender/shader_fx/intern/FX_shader_colorize.cc
index f90a9455e30..3f3f56a8609 100644
--- a/source/blender/shader_fx/intern/FX_shader_colorize.cc
+++ b/source/blender/shader_fx/intern/FX_shader_colorize.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.cc b/source/blender/shader_fx/intern/FX_shader_flip.cc
index 2d65fc90a4c..60c33e59e85 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.cc
+++ b/source/blender/shader_fx/intern/FX_shader_flip.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc
index 63fb3656817..16c4ac369ae 100644
--- a/source/blender/shader_fx/intern/FX_shader_glow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_glow.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.cc b/source/blender/shader_fx/intern/FX_shader_pixel.cc
index f8584a47e34..b70fc859ef6 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.cc
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_rim.cc b/source/blender/shader_fx/intern/FX_shader_rim.cc
index e657c457919..a542698193f 100644
--- a/source/blender/shader_fx/intern/FX_shader_rim.cc
+++ b/source/blender/shader_fx/intern/FX_shader_rim.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_screen_types.h"
 #include "DNA_shader_fx_types.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc
index 6d1771de158..8db8740ee9c 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.cc b/source/blender/shader_fx/intern/FX_shader_swirl.cc
index 19656bf8015..84fd8381371 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.cc
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_util.cc b/source/blender/shader_fx/intern/FX_shader_util.cc
index e4282a9e29f..779e0c0dec1 100644
--- a/source/blender/shader_fx/intern/FX_shader_util.cc
+++ b/source/blender/shader_fx/intern/FX_shader_util.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_wave.cc b/source/blender/shader_fx/intern/FX_shader_wave.cc
index d1ff42dc867..8de832c41cb 100644
--- a/source/blender/shader_fx/intern/FX_shader_wave.cc
+++ b/source/blender/shader_fx/intern/FX_shader_wave.cc
@@ -6,7 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"