From 4d37fb80b17734f21c64631a908a45492becb9e6 Mon Sep 17 00:00:00 2001
From: Richard Antalik <richardantalik@gmail.com>
Date: Thu, 2 Nov 2023 01:05:06 +0100
Subject: [PATCH] Cleanup: Convert VSE headers from .h to .hh

---
 source/blender/blenkernel/intern/blender.cc   |  2 +-
 source/blender/blenkernel/intern/bpath.cc     |  2 +-
 source/blender/blenkernel/intern/image.cc     |  2 +-
 source/blender/blenkernel/intern/ipo.cc       |  2 +-
 source/blender/blenkernel/intern/object.cc    |  2 +-
 source/blender/blenkernel/intern/scene.cc     |  6 +-
 source/blender/blenkernel/intern/sound.cc     |  6 +-
 source/blender/blenloader/intern/readfile.cc  | 10 ++--
 .../blenloader/intern/versioning_250.cc       |  2 +-
 .../blenloader/intern/versioning_260.cc       |  6 +-
 .../blenloader/intern/versioning_270.cc       |  4 +-
 .../blenloader/intern/versioning_280.cc       |  6 +-
 .../blenloader/intern/versioning_290.cc       | 10 ++--
 .../blenloader/intern/versioning_300.cc       | 10 ++--
 .../blenloader/intern/versioning_400.cc       |  2 +-
 .../blenloader/intern/versioning_common.cc    |  2 +-
 .../blenloader/intern/versioning_legacy.cc    |  4 +-
 .../intern/builder/deg_builder_nodes.cc       |  4 +-
 .../intern/builder/deg_builder_relations.cc   |  2 +-
 .../intern/eval/deg_eval_copy_on_write.cc     |  2 +-
 .../eval/deg_eval_runtime_backup_sequencer.cc |  2 +-
 source/blender/editors/animation/anim_deps.cc |  4 +-
 .../blender/editors/animation/anim_filter.cc  |  4 +-
 source/blender/editors/animation/anim_ops.cc  |  6 +-
 .../blender/editors/render/render_internal.cc |  2 +-
 .../blender/editors/render/render_opengl.cc   |  2 +-
 source/blender/editors/scene/scene_edit.cc    |  4 +-
 .../blender/editors/screen/screen_context.cc  |  8 +--
 source/blender/editors/sound/sound_ops.cc     |  4 +-
 .../editors/space_outliner/outliner_select.cc |  4 +-
 .../editors/space_outliner/outliner_sync.cc   |  2 +-
 .../editors/space_outliner/outliner_tools.cc  |  4 +-
 .../tree/tree_display_sequencer.cc            |  2 +-
 .../editors/space_sequencer/sequencer_add.cc  | 22 ++++----
 .../sequencer_channels_draw.cc                |  6 +-
 .../sequencer_channels_edit.cc                |  6 +-
 .../space_sequencer/sequencer_drag_drop.cc    |  8 +--
 .../editors/space_sequencer/sequencer_edit.cc | 30 +++++-----
 .../space_sequencer/sequencer_modifier.cc     | 12 ++--
 .../space_sequencer/sequencer_preview_draw.cc | 18 +++---
 .../space_sequencer/sequencer_proxy.cc        |  8 +--
 .../space_sequencer/sequencer_retiming.cc     | 12 ++--
 .../sequencer_retiming_draw.cc                |  6 +-
 .../space_sequencer/sequencer_select.cc       | 16 +++---
 .../space_sequencer/sequencer_thumbnails.cc   |  8 +--
 .../sequencer_timeline_draw.cc                | 22 ++++----
 .../editors/space_sequencer/sequencer_view.cc | 10 ++--
 .../space_sequencer/space_sequencer.cc        |  8 +--
 source/blender/editors/transform/transform.cc |  2 +-
 .../transform/transform_convert_sequencer.cc  | 20 +++----
 .../transform_convert_sequencer_image.cc      | 14 ++---
 .../transform_convert_sequencer_retiming.cc   |  6 +-
 .../editors/transform/transform_generics.cc   |  4 +-
 .../editors/transform/transform_gizmo_2d.cc   | 10 ++--
 .../transform_mode_edge_seq_slide.cc          |  6 +-
 .../transform/transform_orientations.cc       |  2 +-
 .../editors/transform/transform_snap.cc       |  6 +-
 .../transform/transform_snap_sequencer.cc     | 14 ++---
 source/blender/editors/util/ed_util_imbuf.cc  |  4 +-
 .../blender/imbuf/intern/colormanagement.cc   |  2 +-
 source/blender/makesrna/intern/rna_camera.cc  |  2 +-
 source/blender/makesrna/intern/rna_color.cc   |  4 +-
 .../blender/makesrna/intern/rna_movieclip.cc  |  2 +-
 source/blender/makesrna/intern/rna_scene.cc   |  6 +-
 .../blender/makesrna/intern/rna_sequencer.cc  | 30 +++++-----
 .../makesrna/intern/rna_sequencer_api.cc      | 16 +++---
 source/blender/makesrna/intern/rna_sound.cc   |  2 +-
 source/blender/makesrna/intern/rna_space.cc   |  6 +-
 source/blender/render/intern/pipeline.cc      |  4 +-
 source/blender/sequencer/CMakeLists.txt       | 56 +++++++++----------
 .../sequencer/{SEQ_add.h => SEQ_add.hh}       |  7 ---
 .../{SEQ_animation.h => SEQ_animation.hh}     |  8 ---
 .../{SEQ_channels.h => SEQ_channels.hh}       |  8 ---
 .../{SEQ_clipboard.h => SEQ_clipboard.hh}     |  8 ---
 .../sequencer/{SEQ_edit.h => SEQ_edit.hh}     |  8 ---
 .../{SEQ_effects.h => SEQ_effects.hh}         |  8 ---
 .../{SEQ_iterator.h => SEQ_iterator.hh}       |  8 ---
 .../{SEQ_modifier.h => SEQ_modifier.hh}       |  8 ---
 .../{SEQ_prefetch.h => SEQ_prefetch.hh}       |  8 ---
 .../sequencer/{SEQ_proxy.h => SEQ_proxy.hh}   |  8 ---
 .../{SEQ_relations.h => SEQ_relations.hh}     |  8 ---
 .../sequencer/{SEQ_render.h => SEQ_render.hh} |  8 ---
 .../sequencer/{SEQ_select.h => SEQ_select.hh} |  8 ---
 .../{SEQ_sequencer.h => SEQ_sequencer.hh}     |  8 ---
 .../sequencer/{SEQ_sound.h => SEQ_sound.hh}   |  8 ---
 .../sequencer/{SEQ_time.h => SEQ_time.hh}     |  7 ---
 .../{SEQ_transform.h => SEQ_transform.hh}     |  8 ---
 .../sequencer/{SEQ_utils.h => SEQ_utils.hh}   |  7 ---
 source/blender/sequencer/intern/animation.cc  |  2 +-
 source/blender/sequencer/intern/channels.cc   |  8 +--
 source/blender/sequencer/intern/clipboard.cc  |  6 +-
 source/blender/sequencer/intern/disk_cache.cc | 18 +++---
 .../intern/{disk_cache.h => disk_cache.hh}    |  7 ---
 source/blender/sequencer/intern/effects.cc    | 22 ++++----
 .../intern/{effects.h => effects.hh}          | 10 +---
 .../blender/sequencer/intern/image_cache.cc   | 17 +++---
 .../intern/{image_cache.h => image_cache.hh}  | 10 +---
 source/blender/sequencer/intern/iterator.cc   | 10 ++--
 source/blender/sequencer/intern/modifier.cc   |  8 +--
 source/blender/sequencer/intern/multiview.cc  |  2 +-
 .../intern/{multiview.h => multiview.hh}      |  0
 source/blender/sequencer/intern/prefetch.cc   | 18 +++---
 .../intern/{prefetch.h => prefetch.hh}        |  8 ---
 source/blender/sequencer/intern/proxy.cc      | 24 ++++----
 .../sequencer/intern/{proxy.h => proxy.hh}    |  8 ---
 source/blender/sequencer/intern/proxy_job.cc  |  8 +--
 source/blender/sequencer/intern/render.cc     | 38 ++++++-------
 .../sequencer/intern/{render.h => render.hh}  |  0
 .../sequencer/intern/sequence_lookup.cc       |  6 +-
 source/blender/sequencer/intern/sequencer.cc  | 32 +++++------
 .../intern/{sequencer.h => sequencer.hh}      |  0
 source/blender/sequencer/intern/sound.cc      |  8 +--
 source/blender/sequencer/intern/strip_add.cc  | 30 +++++-----
 source/blender/sequencer/intern/strip_edit.cc | 28 +++++-----
 .../sequencer/intern/strip_relations.cc       | 18 +++---
 .../sequencer/intern/strip_retiming.cc        | 20 +++----
 .../blender/sequencer/intern/strip_select.cc  |  4 +-
 source/blender/sequencer/intern/strip_time.cc | 20 +++----
 .../intern/{strip_time.h => strip_time.hh}    |  8 ---
 .../sequencer/intern/strip_transform.cc       | 22 ++++----
 source/blender/sequencer/intern/utils.cc      | 28 +++++-----
 .../sequencer/intern/{utils.h => utils.hh}    |  8 ---
 .../windowmanager/intern/wm_init_exit.cc      |  2 +-
 .../blender/windowmanager/intern/wm_jobs.cc   |  2 +-
 124 files changed, 475 insertions(+), 670 deletions(-)
 rename source/blender/sequencer/{SEQ_add.h => SEQ_add.hh} (99%)
 rename source/blender/sequencer/{SEQ_animation.h => SEQ_animation.hh} (94%)
 rename source/blender/sequencer/{SEQ_channels.h => SEQ_channels.hh} (94%)
 rename source/blender/sequencer/{SEQ_clipboard.h => SEQ_clipboard.hh} (93%)
 rename source/blender/sequencer/{SEQ_edit.h => SEQ_edit.hh} (98%)
 rename source/blender/sequencer/{SEQ_effects.h => SEQ_effects.hh} (97%)
 rename source/blender/sequencer/{SEQ_iterator.h => SEQ_iterator.hh} (99%)
 rename source/blender/sequencer/{SEQ_modifier.h => SEQ_modifier.hh} (97%)
 rename source/blender/sequencer/{SEQ_prefetch.h => SEQ_prefetch.hh} (87%)
 rename source/blender/sequencer/{SEQ_proxy.h => SEQ_proxy.hh} (95%)
 rename source/blender/sequencer/{SEQ_relations.h => SEQ_relations.hh} (97%)
 rename source/blender/sequencer/{SEQ_render.h => SEQ_render.hh} (98%)
 rename source/blender/sequencer/{SEQ_select.h => SEQ_select.hh} (87%)
 rename source/blender/sequencer/{SEQ_sequencer.h => SEQ_sequencer.hh} (98%)
 rename source/blender/sequencer/{SEQ_sound.h => SEQ_sound.hh} (97%)
 rename source/blender/sequencer/{SEQ_time.h => SEQ_time.hh} (98%)
 rename source/blender/sequencer/{SEQ_transform.h => SEQ_transform.hh} (98%)
 rename source/blender/sequencer/{SEQ_utils.h => SEQ_utils.hh} (96%)
 rename source/blender/sequencer/intern/{disk_cache.h => disk_cache.hh} (94%)
 rename source/blender/sequencer/intern/{effects.h => effects.hh} (89%)
 rename source/blender/sequencer/intern/{image_cache.h => image_cache.hh} (95%)
 rename source/blender/sequencer/intern/{multiview.h => multiview.hh} (100%)
 rename source/blender/sequencer/intern/{prefetch.h => prefetch.hh} (91%)
 rename source/blender/sequencer/intern/{proxy.h => proxy.hh} (90%)
 rename source/blender/sequencer/intern/{render.h => render.hh} (100%)
 rename source/blender/sequencer/intern/{sequencer.h => sequencer.hh} (100%)
 rename source/blender/sequencer/intern/{strip_time.h => strip_time.hh} (96%)
 rename source/blender/sequencer/intern/{utils.h => utils.hh} (85%)

diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index 32d954a2292..9c4eac626eb 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -45,7 +45,7 @@
 #include "RE_pipeline.h"
 #include "RE_texture.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #include "BLF_api.h"
 
diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc
index 88020c12d3b..7f018d7e681 100644
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@@ -69,7 +69,7 @@
 
 #include "CLG_log.h"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #ifndef _MSC_VER
 #  include "BLI_strict_flags.h"
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index e229a541b7c..535e89afd45 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -86,7 +86,7 @@
 
 #include "RE_pipeline.h"
 
-#include "SEQ_utils.h" /* SEQ_get_topmost_sequence() */
+#include "SEQ_utils.hh" /* SEQ_get_topmost_sequence() */
 
 #include "GPU_material.h"
 #include "GPU_texture.h"
diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc
index c8d643ff56c..891afe6babf 100644
--- a/source/blender/blenkernel/intern/ipo.cc
+++ b/source/blender/blenkernel/intern/ipo.cc
@@ -60,7 +60,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index ac914a994bb..7d08b2c6fc7 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -139,7 +139,7 @@
 #include "BLO_read_write.hh"
 #include "BLO_readfile.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index 1260b51afde..74da723a9d0 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -101,9 +101,9 @@
 
 #include "RNA_access.hh"
 
-#include "SEQ_edit.h"
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_edit.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc
index d7a6a2d9683..2b0e2688074 100644
--- a/source/blender/blenkernel/intern/sound.cc
+++ b/source/blender/blenkernel/intern/sound.cc
@@ -55,9 +55,9 @@
 
 #include "BLO_read_write.hh"
 
-#include "SEQ_sequencer.h"
-#include "SEQ_sound.h"
-#include "SEQ_time.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_sound.hh"
+#include "SEQ_time.hh"
 
 static void sound_free_audio(bSound *sound);
 
diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc
index 88d1ec2e593..33182d74dd2 100644
--- a/source/blender/blenloader/intern/readfile.cc
+++ b/source/blender/blenloader/intern/readfile.cc
@@ -99,11 +99,11 @@
 #include "BLO_readfile.h"
 #include "BLO_undofile.hh"
 
-#include "SEQ_clipboard.h"
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_utils.h"
+#include "SEQ_clipboard.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_utils.hh"
 
 #include "readfile.hh"
 
diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc
index f6a1e6d1c84..271091c4299 100644
--- a/source/blender/blenloader/intern/versioning_250.cc
+++ b/source/blender/blenloader/intern/versioning_250.cc
@@ -69,7 +69,7 @@
 #include "BKE_sound.h"
 #include "BKE_texture.h"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #include "BLO_readfile.h"
 
diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc
index f75fc0b7bc0..f980070f304 100644
--- a/source/blender/blenloader/intern/versioning_260.cc
+++ b/source/blender/blenloader/intern/versioning_260.cc
@@ -67,9 +67,9 @@
 #include "BKE_texture.h"
 #include "BKE_tracking.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_utils.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_utils.hh"
 
 #ifdef WITH_FFMPEG
 #  include "BKE_writeffmpeg.h"
diff --git a/source/blender/blenloader/intern/versioning_270.cc b/source/blender/blenloader/intern/versioning_270.cc
index 24e58b003e7..f7b16097553 100644
--- a/source/blender/blenloader/intern/versioning_270.cc
+++ b/source/blender/blenloader/intern/versioning_270.cc
@@ -61,8 +61,8 @@
 #include "BKE_tracking.h"
 #include "DNA_material_types.h"
 
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
 
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc
index f14db696176..d8f8d7819c3 100644
--- a/source/blender/blenloader/intern/versioning_280.cc
+++ b/source/blender/blenloader/intern/versioning_280.cc
@@ -93,9 +93,9 @@
 #include "BKE_unit.h"
 #include "BKE_workspace.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_utils.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_utils.hh"
 
 #include "NOD_shader.h"
 
diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc
index aaedfdcceeb..f5a4a03ccc8 100644
--- a/source/blender/blenloader/intern/versioning_290.cc
+++ b/source/blender/blenloader/intern/versioning_290.cc
@@ -66,11 +66,11 @@
 
 #include "RNA_access.hh"
 
-#include "SEQ_proxy.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_proxy.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
 #include "BLO_readfile.h"
 #include "readfile.hh"
diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 6853bb96263..815f91a9691 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -87,12 +87,12 @@
 
 #include "readfile.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "versioning_common.hh"
 
diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc
index 5a9a81a5667..d39a370b112 100644
--- a/source/blender/blenloader/intern/versioning_400.cc
+++ b/source/blender/blenloader/intern/versioning_400.cc
@@ -59,7 +59,7 @@
 #include "BKE_tracking.h"
 
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #include "ANIM_armature_iter.hh"
 #include "ANIM_bone_collections.h"
diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc
index d68be18250e..08a370d5c3a 100644
--- a/source/blender/blenloader/intern/versioning_common.cc
+++ b/source/blender/blenloader/intern/versioning_common.cc
@@ -29,7 +29,7 @@
 #include "BKE_node.hh"
 #include "BKE_node_runtime.hh"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc
index 71a86b672c8..41582ca6339 100644
--- a/source/blender/blenloader/intern/versioning_legacy.cc
+++ b/source/blender/blenloader/intern/versioning_legacy.cc
@@ -67,8 +67,8 @@
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
 
 #include "BLO_readfile.h"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index ba255e7e4fb..aa185693cf7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -101,8 +101,8 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_key.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 7b16b2a8575..a2369ff9fad 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -88,7 +88,7 @@
 #include "RNA_prototypes.h"
 #include "RNA_types.hh"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 60f2f2512fb..3ac56952407 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -78,7 +78,7 @@
 #include "BKE_pointcache.h"
 #include "BKE_sound.h"
 
-#include "SEQ_relations.h"
+#include "SEQ_relations.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_nodes.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
index 60489e34732..753943a7e8d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
@@ -15,7 +15,7 @@
 
 #include "BKE_sound.h"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/editors/animation/anim_deps.cc b/source/blender/editors/animation/anim_deps.cc
index ea453c5a6ab..a7170989a16 100644
--- a/source/blender/editors/animation/anim_deps.cc
+++ b/source/blender/editors/animation/anim_deps.cc
@@ -37,8 +37,8 @@
 #include "RNA_access.hh"
 #include "RNA_path.hh"
 
-#include "SEQ_sequencer.h"
-#include "SEQ_utils.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_utils.hh"
 
 #include "ED_anim_api.hh"
 
diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc
index 9c51460feb0..2657932b4f3 100644
--- a/source/blender/editors/animation/anim_filter.cc
+++ b/source/blender/editors/animation/anim_filter.cc
@@ -86,8 +86,8 @@
 #include "ED_anim_api.hh"
 #include "ED_markers.hh"
 
-#include "SEQ_sequencer.h"
-#include "SEQ_utils.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_utils.hh"
 
 #include "ANIM_bone_collections.h"
 
diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc
index 46418957f35..4259cfd3146 100644
--- a/source/blender/editors/animation/anim_ops.cc
+++ b/source/blender/editors/animation/anim_ops.cc
@@ -36,9 +36,9 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "anim_intern.h"
 
diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc
index f1935e7bfd8..7abde30bb02 100644
--- a/source/blender/editors/render/render_internal.cc
+++ b/source/blender/editors/render/render_internal.cc
@@ -66,7 +66,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "SEQ_relations.h"
+#include "SEQ_relations.hh"
 
 #include "render_intern.hh"
 
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index 214871bcdff..2bccdcd50e0 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -67,7 +67,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "SEQ_render.h"
+#include "SEQ_render.hh"
 
 #include "GPU_framebuffer.h"
 #include "GPU_matrix.h"
diff --git a/source/blender/editors/scene/scene_edit.cc b/source/blender/editors/scene/scene_edit.cc
index 9ae1a7719f4..319aee36508 100644
--- a/source/blender/editors/scene/scene_edit.cc
+++ b/source/blender/editors/scene/scene_edit.cc
@@ -35,8 +35,8 @@
 #include "ED_screen.hh"
 #include "ED_util.hh"
 
-#include "SEQ_relations.h"
-#include "SEQ_select.h"
+#include "SEQ_relations.hh"
+#include "SEQ_select.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/screen/screen_context.cc b/source/blender/editors/screen/screen_context.cc
index bba9344be12..604151aad28 100644
--- a/source/blender/editors/screen/screen_context.cc
+++ b/source/blender/editors/screen/screen_context.cc
@@ -44,10 +44,10 @@
 #include "ED_clip.hh"
 #include "ED_gpencil_legacy.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_transform.h"
+#include "SEQ_channels.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_transform.hh"
 
 #include "UI_interface.hh"
 #include "WM_api.hh"
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index c474dc7770c..b9cc586b64c 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -37,8 +37,8 @@
 #include "RNA_enum_types.hh"
 #include "RNA_prototypes.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_utils.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_utils.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc
index 3d43f8e062f..bc52a13d50f 100644
--- a/source/blender/editors/space_outliner/outliner_select.cc
+++ b/source/blender/editors/space_outliner/outliner_select.cc
@@ -54,8 +54,8 @@
 #include "ED_text.hh"
 #include "ED_undo.hh"
 
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_outliner/outliner_sync.cc b/source/blender/editors/space_outliner/outliner_sync.cc
index f8ef5d9ea0b..5713042de74 100644
--- a/source/blender/editors/space_outliner/outliner_sync.cc
+++ b/source/blender/editors/space_outliner/outliner_sync.cc
@@ -30,7 +30,7 @@
 #include "ED_object.hh"
 #include "ED_outliner.hh"
 
-#include "SEQ_select.h"
+#include "SEQ_select.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 8d654b80c73..dab63e7c30e 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -83,8 +83,8 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
 
 #include "outliner_intern.hh"
 #include "tree/tree_element_grease_pencil_node.hh"
diff --git a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
index 21510125760..d1ff5e8f525 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
@@ -15,7 +15,7 @@
 #include "DNA_sequence_types.h"
 #include "DNA_space_types.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #include "../outliner_intern.hh"
 #include "tree_display.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc
index f7b5085fd18..e6ae7d2257e 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.cc
+++ b/source/blender/editors/space_sequencer/sequencer_add.cc
@@ -43,17 +43,17 @@
 #include "RNA_enum_types.hh"
 #include "RNA_prototypes.h"
 
-#include "SEQ_add.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_add.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "ED_scene.hh"
 /* For menu, popup, icons, etc. */
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
index c755b833284..f9f72f8e2d7 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
@@ -30,9 +30,9 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_channels.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
index 1efa361cbf6..b71c7ba38c0 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc
@@ -19,9 +19,9 @@
 
 #include "UI_view2d.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_channels.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
index 9a866c8579a..18f31df3d03 100644
--- a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
+++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc
@@ -19,10 +19,10 @@
 #include "BKE_image.h"
 #include "BKE_main.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_transform.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_transform.hh"
 
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc
index dd68427af79..b0606b8814b 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_edit.cc
@@ -32,21 +32,21 @@
 #include "BKE_report.h"
 #include "BKE_sound.h"
 
-#include "SEQ_add.h"
-#include "SEQ_animation.h"
-#include "SEQ_channels.h"
-#include "SEQ_clipboard.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_add.hh"
+#include "SEQ_animation.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_clipboard.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.cc b/source/blender/editors/space_sequencer/sequencer_modifier.cc
index 1c472a3c9c1..8440530486f 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.cc
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.cc
@@ -21,12 +21,12 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_relations.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_sound.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_sound.hh"
 
 /* Own include. */
 #include "sequencer_intern.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
index 0cbd26628cf..dd372933488 100644
--- a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc
@@ -39,15 +39,15 @@
 
 #include "BIF_glutil.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_proxy.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.cc b/source/blender/editors/space_sequencer/sequencer_proxy.cc
index 5f92e370d0f..bb966054fd1 100644
--- a/source/blender/editors/space_sequencer/sequencer_proxy.cc
+++ b/source/blender/editors/space_sequencer/sequencer_proxy.cc
@@ -18,10 +18,10 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc
index 60f5ecfa0bc..4ab81930ec5 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc
@@ -23,13 +23,13 @@
 #include "ED_select_utils.hh"
 #include "ED_sequencer.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
 #include "WM_api.hh"
 #include "WM_toolsystem.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
index 9f5fcd107a0..c5ab88c92c7 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
@@ -46,10 +46,10 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 /* Own include. */
 #include "sequencer_intern.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_select.cc b/source/blender/editors/space_sequencer/sequencer_select.cc
index 9d120683408..e04ad8a46f7 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.cc
+++ b/source/blender/editors/space_sequencer/sequencer_select.cc
@@ -28,15 +28,15 @@
 
 #include "RNA_define.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 /* For menu, popup, icons, etc. */
 
diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
index 3bb1455cae3..e55bdbd5d91 100644
--- a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
+++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc
@@ -20,10 +20,10 @@
 
 #include "BIF_glutil.hh"
 
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
index 7ffe5a8ab02..2f4ebb7a137 100644
--- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
@@ -45,17 +45,17 @@
 
 #include "RNA_prototypes.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_view.cc b/source/blender/editors/space_sequencer/sequencer_view.cc
index 24743f2d13f..42ae73bf056 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.cc
+++ b/source/blender/editors/space_sequencer/sequencer_view.cc
@@ -21,11 +21,11 @@
 
 #include "UI_view2d.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
 /* For menu, popup, icons, etc. */
 #include "ED_anim_api.hh"
diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc
index 95d2f3b9367..96edd77d9e0 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.cc
+++ b/source/blender/editors/space_sequencer/space_sequencer.cc
@@ -39,10 +39,10 @@
 #include "WM_api.hh"
 #include "WM_message.hh"
 
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc
index d8256eb6332..afaa51c98ab 100644
--- a/source/blender/editors/transform/transform.cc
+++ b/source/blender/editors/transform/transform.cc
@@ -37,7 +37,7 @@
 
 #include "ANIM_keyframing.hh"
 
-#include "SEQ_transform.h"
+#include "SEQ_transform.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/transform/transform_convert_sequencer.cc b/source/blender/editors/transform/transform_convert_sequencer.cc
index 698da16b0e4..d1896d906b4 100644
--- a/source/blender/editors/transform/transform_convert_sequencer.cc
+++ b/source/blender/editors/transform/transform_convert_sequencer.cc
@@ -21,16 +21,16 @@
 #include "ED_markers.hh"
 #include "ED_time_scrub_ui.hh"
 
-#include "SEQ_animation.h"
-#include "SEQ_channels.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_animation.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.cc b/source/blender/editors/transform/transform_convert_sequencer_image.cc
index 79a0739b015..9f3513ef7d3 100644
--- a/source/blender/editors/transform/transform_convert_sequencer_image.cc
+++ b/source/blender/editors/transform/transform_convert_sequencer_image.cc
@@ -18,13 +18,13 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/editors/transform/transform_convert_sequencer_retiming.cc b/source/blender/editors/transform/transform_convert_sequencer_retiming.cc
index 50e6864e5ce..5758a0016d6 100644
--- a/source/blender/editors/transform/transform_convert_sequencer_retiming.cc
+++ b/source/blender/editors/transform/transform_convert_sequencer_retiming.cc
@@ -17,10 +17,10 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 
-#include "SEQ_relations.h"
+#include "SEQ_relations.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/editors/transform/transform_generics.cc b/source/blender/editors/transform/transform_generics.cc
index 989a636b900..1c5c4646706 100644
--- a/source/blender/editors/transform/transform_generics.cc
+++ b/source/blender/editors/transform/transform_generics.cc
@@ -32,7 +32,7 @@
 #include "BKE_modifier.h"
 #include "BKE_paint.hh"
 
-#include "SEQ_transform.h"
+#include "SEQ_transform.hh"
 
 #include "ED_clip.hh"
 #include "ED_image.hh"
@@ -47,7 +47,7 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sequencer.hh"
 
 #include "transform.hh"
 #include "transform_convert.hh"
diff --git a/source/blender/editors/transform/transform_gizmo_2d.cc b/source/blender/editors/transform/transform_gizmo_2d.cc
index 5b56cbb658f..d768fcfb75a 100644
--- a/source/blender/editors/transform/transform_gizmo_2d.cc
+++ b/source/blender/editors/transform/transform_gizmo_2d.cc
@@ -41,11 +41,11 @@
 #include "ED_screen.hh"
 #include "ED_uvedit.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
 #include "transform.hh"
 #include "transform_gizmo.hh"
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 11e4d65fc49..072b006ddd4 100644
--- a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc
+++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc
@@ -24,9 +24,9 @@
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/transform/transform_orientations.cc b/source/blender/editors/transform/transform_orientations.cc
index 94d0c538e65..18bc4abe338 100644
--- a/source/blender/editors/transform/transform_orientations.cc
+++ b/source/blender/editors/transform/transform_orientations.cc
@@ -46,7 +46,7 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "SEQ_select.h"
+#include "SEQ_select.hh"
 
 #include "transform.hh"
 #include "transform_orientations.hh"
diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc
index 1aef7c14dd0..64c209d5440 100644
--- a/source/blender/editors/transform/transform_snap.cc
+++ b/source/blender/editors/transform/transform_snap.cc
@@ -43,9 +43,9 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "SEQ_iterator.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #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 cdd37dc084b..c8c36b4b0c1 100644
--- a/source/blender/editors/transform/transform_snap_sequencer.cc
+++ b/source/blender/editors/transform/transform_snap_sequencer.cc
@@ -19,13 +19,13 @@
 
 #include "UI_view2d.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
 #include "transform.hh"
 #include "transform_convert.hh"
diff --git a/source/blender/editors/util/ed_util_imbuf.cc b/source/blender/editors/util/ed_util_imbuf.cc
index f7a364e0e06..401ffb81783 100644
--- a/source/blender/editors/util/ed_util_imbuf.cc
+++ b/source/blender/editors/util/ed_util_imbuf.cc
@@ -28,8 +28,8 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc
index 2ca619276fd..07d45cac7b1 100644
--- a/source/blender/imbuf/intern/colormanagement.cc
+++ b/source/blender/imbuf/intern/colormanagement.cc
@@ -45,7 +45,7 @@
 
 #include "RNA_define.hh"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #include <ocio_capi.h>
 
diff --git a/source/blender/makesrna/intern/rna_camera.cc b/source/blender/makesrna/intern/rna_camera.cc
index 586bdba10e5..5c696fe5722 100644
--- a/source/blender/makesrna/intern/rna_camera.cc
+++ b/source/blender/makesrna/intern/rna_camera.cc
@@ -30,7 +30,7 @@
 #  include "DEG_depsgraph.hh"
 #  include "DEG_depsgraph_build.hh"
 
-#  include "SEQ_relations.h"
+#  include "SEQ_relations.hh"
 
 static float rna_Camera_angle_get(PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc
index c769668912e..1e4929b03eb 100644
--- a/source/blender/makesrna/intern/rna_color.cc
+++ b/source/blender/makesrna/intern/rna_color.cc
@@ -62,8 +62,8 @@ const EnumPropertyItem rna_enum_color_space_convert_default_items[] = {
 #  include "IMB_colormanagement.h"
 #  include "IMB_imbuf.h"
 
-#  include "SEQ_iterator.h"
-#  include "SEQ_relations.h"
+#  include "SEQ_iterator.hh"
+#  include "SEQ_relations.hh"
 
 static int rna_CurveMapping_curves_length(PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc
index 9e1713ba654..6e79562b660 100644
--- a/source/blender/makesrna/intern/rna_movieclip.cc
+++ b/source/blender/makesrna/intern/rna_movieclip.cc
@@ -37,7 +37,7 @@
 #  include "DNA_screen_types.h"
 #  include "DNA_space_types.h"
 
-#  include "SEQ_relations.h"
+#  include "SEQ_relations.hh"
 
 static void rna_MovieClip_reload_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc
index ce8438b027c..c53c6fe754c 100644
--- a/source/blender/makesrna/intern/rna_scene.cc
+++ b/source/blender/makesrna/intern/rna_scene.cc
@@ -755,9 +755,9 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = {
 #  include "DEG_depsgraph_build.hh"
 #  include "DEG_depsgraph_query.hh"
 
-#  include "SEQ_relations.h"
-#  include "SEQ_sequencer.h"
-#  include "SEQ_sound.h"
+#  include "SEQ_relations.hh"
+#  include "SEQ_sequencer.hh"
+#  include "SEQ_sound.hh"
 
 #  ifdef WITH_FREESTYLE
 #    include "FRS_freestyle.h"
diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc
index a859ea42439..e5fa8c4b302 100644
--- a/source/blender/makesrna/intern/rna_sequencer.cc
+++ b/source/blender/makesrna/intern/rna_sequencer.cc
@@ -38,21 +38,21 @@
 
 #include "rna_internal.h"
 
-#include "SEQ_add.h"
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
+#include "SEQ_add.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_sound.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_sound.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include "WM_types.hh"
 
@@ -123,7 +123,7 @@ const EnumPropertyItem rna_enum_strip_color_items[] = {
 
 #  include "IMB_imbuf.h"
 
-#  include "SEQ_edit.h"
+#  include "SEQ_edit.hh"
 
 struct SequenceSearchData {
   Sequence *seq;
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.cc b/source/blender/makesrna/intern/rna_sequencer_api.cc
index af769f2e14c..cbd4c0e52b7 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.cc
+++ b/source/blender/makesrna/intern/rna_sequencer_api.cc
@@ -18,7 +18,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "SEQ_edit.h"
+#include "SEQ_edit.hh"
 
 #include "rna_internal.h"
 
@@ -41,14 +41,14 @@
 #  include "IMB_imbuf.h"
 #  include "IMB_imbuf_types.h"
 
-#  include "SEQ_add.h"
-#  include "SEQ_edit.h"
-#  include "SEQ_effects.h"
-#  include "SEQ_relations.h"
-#  include "SEQ_render.h"
+#  include "SEQ_add.hh"
+#  include "SEQ_edit.hh"
+#  include "SEQ_effects.hh"
+#  include "SEQ_relations.hh"
+#  include "SEQ_render.hh"
 #  include "SEQ_retiming.hh"
-#  include "SEQ_sequencer.h"
-#  include "SEQ_time.h"
+#  include "SEQ_sequencer.hh"
+#  include "SEQ_time.hh"
 
 #  include "WM_api.hh"
 
diff --git a/source/blender/makesrna/intern/rna_sound.cc b/source/blender/makesrna/intern/rna_sound.cc
index 2c5bbe21cb7..054cd788555 100644
--- a/source/blender/makesrna/intern/rna_sound.cc
+++ b/source/blender/makesrna/intern/rna_sound.cc
@@ -37,7 +37,7 @@ static const EnumPropertyItem rna_enum_audio_channels_items[] = {
 
 #  include "DEG_depsgraph.hh"
 
-#  include "SEQ_sequencer.h"
+#  include "SEQ_sequencer.hh"
 
 static void rna_Sound_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc
index 9051527245e..db7b30204cc 100644
--- a/source/blender/makesrna/intern/rna_space.cc
+++ b/source/blender/makesrna/intern/rna_space.cc
@@ -52,9 +52,9 @@
 
 #include "rna_internal.h"
 
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 68388c79c38..56d0f792f3d 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -81,8 +81,8 @@
 #include "RE_pipeline.h"
 #include "RE_texture.h"
 
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
 
 #include "GPU_context.h"
 #include "WM_api.hh"
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 64670a6f46f..6fc83546442 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -25,49 +25,49 @@ set(INC_SYS
 )
 
 set(SRC
-  SEQ_add.h
-  SEQ_animation.h
-  SEQ_channels.h
-  SEQ_clipboard.h
-  SEQ_edit.h
-  SEQ_effects.h
-  SEQ_iterator.h
-  SEQ_modifier.h
-  SEQ_prefetch.h
-  SEQ_proxy.h
-  SEQ_relations.h
-  SEQ_render.h
+  SEQ_add.hh
+  SEQ_animation.hh
+  SEQ_channels.hh
+  SEQ_clipboard.hh
+  SEQ_edit.hh
+  SEQ_effects.hh
+  SEQ_iterator.hh
+  SEQ_modifier.hh
+  SEQ_prefetch.hh
+  SEQ_proxy.hh
+  SEQ_relations.hh
+  SEQ_render.hh
   SEQ_retiming.hh
-  SEQ_select.h
-  SEQ_sequencer.h
-  SEQ_sound.h
-  SEQ_time.h
-  SEQ_transform.h
-  SEQ_utils.h
+  SEQ_select.hh
+  SEQ_sequencer.hh
+  SEQ_sound.hh
+  SEQ_time.hh
+  SEQ_transform.hh
+  SEQ_utils.hh
 
   intern/animation.cc
   intern/channels.cc
   intern/clipboard.cc
   intern/disk_cache.cc
-  intern/disk_cache.h
+  intern/disk_cache.hh
   intern/effects.cc
-  intern/effects.h
+  intern/effects.hh
   intern/image_cache.cc
-  intern/image_cache.h
+  intern/image_cache.hh
   intern/iterator.cc
   intern/modifier.cc
   intern/multiview.cc
-  intern/multiview.h
+  intern/multiview.hh
   intern/prefetch.cc
-  intern/prefetch.h
+  intern/prefetch.hh
   intern/proxy.cc
-  intern/proxy.h
+  intern/proxy.hh
   intern/proxy_job.cc
   intern/render.cc
-  intern/render.h
+  intern/render.hh
   intern/sequence_lookup.cc
   intern/sequencer.cc
-  intern/sequencer.h
+  intern/sequencer.hh
   intern/sound.cc
   intern/strip_add.cc
   intern/strip_edit.cc
@@ -75,10 +75,10 @@ set(SRC
   intern/strip_retiming.cc
   intern/strip_select.cc
   intern/strip_time.cc
-  intern/strip_time.h
+  intern/strip_time.hh
   intern/strip_transform.cc
   intern/utils.cc
-  intern/utils.h
+  intern/utils.hh
 )
 
 set(LIB
diff --git a/source/blender/sequencer/SEQ_add.h b/source/blender/sequencer/SEQ_add.hh
similarity index 99%
rename from source/blender/sequencer/SEQ_add.h
rename to source/blender/sequencer/SEQ_add.hh
index cc0e31b2d9b..8ff2ac60eb6 100644
--- a/source/blender/sequencer/SEQ_add.h
+++ b/source/blender/sequencer/SEQ_add.hh
@@ -8,9 +8,6 @@
  * \ingroup sequencer
  */
 #include "BLI_utildefines.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct ListBase;
 struct Scene;
@@ -199,7 +196,3 @@ void SEQ_add_movie_reload_if_needed(struct Main *bmain,
                                     struct Sequence *seq,
                                     bool *r_was_reloaded,
                                     bool *r_can_produce_frames);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_animation.h b/source/blender/sequencer/SEQ_animation.hh
similarity index 94%
rename from source/blender/sequencer/SEQ_animation.h
rename to source/blender/sequencer/SEQ_animation.hh
index 5c8fd1d539e..dc04b1df5b5 100644
--- a/source/blender/sequencer/SEQ_animation.h
+++ b/source/blender/sequencer/SEQ_animation.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct GSet;
 struct ListBase;
 struct Scene;
@@ -41,7 +37,3 @@ void SEQ_animation_restore_original(struct Scene *scene, struct SeqAnimationBack
 void SEQ_animation_duplicate_backup_to_scene(struct Scene *scene,
                                              struct Sequence *seq,
                                              struct SeqAnimationBackup *backup);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_channels.h b/source/blender/sequencer/SEQ_channels.hh
similarity index 94%
rename from source/blender/sequencer/SEQ_channels.h
rename to source/blender/sequencer/SEQ_channels.hh
index 7c809c007e8..bc3423ad9d9 100644
--- a/source/blender/sequencer/SEQ_channels.h
+++ b/source/blender/sequencer/SEQ_channels.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Editing;
 struct ListBase;
 struct SeqTimelineChannel;
@@ -32,7 +28,3 @@ int SEQ_channel_index_get(const struct SeqTimelineChannel *channel);
 ListBase *SEQ_get_channels_by_seq(struct ListBase *seqbase,
                                   struct ListBase *channels,
                                   const struct Sequence *seq);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_clipboard.h b/source/blender/sequencer/SEQ_clipboard.hh
similarity index 93%
rename from source/blender/sequencer/SEQ_clipboard.h
rename to source/blender/sequencer/SEQ_clipboard.hh
index 2af6bf5524c..013cede2f3f 100644
--- a/source/blender/sequencer/SEQ_clipboard.h
+++ b/source/blender/sequencer/SEQ_clipboard.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Main;
 struct Scene;
@@ -33,7 +29,3 @@ void SEQ_clipboard_active_seq_name_store(struct Scene *scene);
  * \return true if strip was active, false otherwise
  */
 bool SEQ_clipboard_pasted_seq_was_active(struct Sequence *pasted_seq);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_edit.h b/source/blender/sequencer/SEQ_edit.hh
similarity index 98%
rename from source/blender/sequencer/SEQ_edit.h
rename to source/blender/sequencer/SEQ_edit.hh
index 8a40c5d3f51..67820901156 100644
--- a/source/blender/sequencer/SEQ_edit.h
+++ b/source/blender/sequencer/SEQ_edit.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Main;
 struct Scene;
@@ -95,7 +91,3 @@ bool SEQ_edit_remove_gaps(struct Scene *scene,
                           int initial_frame,
                           bool remove_all_gaps);
 void SEQ_edit_sequence_name_set(struct Scene *scene, struct Sequence *seq, const char *new_name);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_effects.h b/source/blender/sequencer/SEQ_effects.hh
similarity index 97%
rename from source/blender/sequencer/SEQ_effects.h
rename to source/blender/sequencer/SEQ_effects.hh
index 921c4a6f101..22a0a4136c6 100644
--- a/source/blender/sequencer/SEQ_effects.h
+++ b/source/blender/sequencer/SEQ_effects.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ImBuf;
 struct SeqRenderData;
 struct Sequence;
@@ -95,7 +91,3 @@ struct SeqEffectHandle SEQ_effect_handle_get(struct Sequence *seq);
 int SEQ_effect_get_num_inputs(int seq_type);
 void SEQ_effect_text_font_unload(struct TextVars *data, bool do_id_user);
 void SEQ_effect_text_font_load(struct TextVars *data, bool do_id_user);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.hh
similarity index 99%
rename from source/blender/sequencer/SEQ_iterator.h
rename to source/blender/sequencer/SEQ_iterator.hh
index 56dd039bf9c..d3ed743a428 100644
--- a/source/blender/sequencer/SEQ_iterator.h
+++ b/source/blender/sequencer/SEQ_iterator.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_ghash.h"
 
 struct GSet;
@@ -234,7 +230,3 @@ void SEQ_query_strip_effect_chain(const struct Scene *scene,
                                   struct ListBase *seqbase,
                                   SeqCollection *collection);
 void SEQ_filter_selected_strips(SeqCollection *collection);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_modifier.h b/source/blender/sequencer/SEQ_modifier.hh
similarity index 97%
rename from source/blender/sequencer/SEQ_modifier.h
rename to source/blender/sequencer/SEQ_modifier.hh
index b538ae887e0..66a1e906e1a 100644
--- a/source/blender/sequencer/SEQ_modifier.h
+++ b/source/blender/sequencer/SEQ_modifier.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BlendDataReader;
 struct BlendLibReader;
 struct BlendWriter;
@@ -64,7 +60,3 @@ int SEQ_sequence_supports_modifiers(struct Sequence *seq);
 
 void SEQ_modifier_blend_write(struct BlendWriter *writer, struct ListBase *modbase);
 void SEQ_modifier_blend_read_data(struct BlendDataReader *reader, struct ListBase *lb);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_prefetch.h b/source/blender/sequencer/SEQ_prefetch.hh
similarity index 87%
rename from source/blender/sequencer/SEQ_prefetch.h
rename to source/blender/sequencer/SEQ_prefetch.hh
index 50e01dfdd13..57b9dc11dfd 100644
--- a/source/blender/sequencer/SEQ_prefetch.h
+++ b/source/blender/sequencer/SEQ_prefetch.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Main;
 struct Scene;
 
@@ -22,7 +18,3 @@ void SEQ_prefetch_stop_all(void);
  */
 void SEQ_prefetch_stop(struct Scene *scene);
 bool SEQ_prefetch_need_redraw(struct Main *bmain, struct Scene *scene);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_proxy.h b/source/blender/sequencer/SEQ_proxy.hh
similarity index 95%
rename from source/blender/sequencer/SEQ_proxy.h
rename to source/blender/sequencer/SEQ_proxy.hh
index 50f4e977e54..53cfa550e10 100644
--- a/source/blender/sequencer/SEQ_proxy.h
+++ b/source/blender/sequencer/SEQ_proxy.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Depsgraph;
 struct GSet;
 struct ListBase;
@@ -47,7 +43,3 @@ typedef struct ProxyBuildJob {
 
 struct wmJob *ED_seq_proxy_wm_job_get(const struct bContext *C);
 ProxyJob *ED_seq_proxy_job_get(const struct bContext *C, struct wmJob *wm_job);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_relations.h b/source/blender/sequencer/SEQ_relations.hh
similarity index 97%
rename from source/blender/sequencer/SEQ_relations.h
rename to source/blender/sequencer/SEQ_relations.hh
index 3fa3b3b525f..b9389f31c45 100644
--- a/source/blender/sequencer/SEQ_relations.h
+++ b/source/blender/sequencer/SEQ_relations.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Main;
 struct MovieClip;
@@ -70,7 +66,3 @@ struct Sequence *SEQ_find_metastrip_by_sequence(ListBase *seqbase /* = ed->seqba
                                                 struct Sequence *meta /* = NULL */,
                                                 struct Sequence *seq);
 bool SEQ_exists_in_seqbase(const struct Sequence *seq, const struct ListBase *seqbase);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.hh
similarity index 98%
rename from source/blender/sequencer/SEQ_render.h
rename to source/blender/sequencer/SEQ_render.hh
index da3e97c4812..3945404a126 100644
--- a/source/blender/sequencer/SEQ_render.h
+++ b/source/blender/sequencer/SEQ_render.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define SEQ_RENDER_THUMB_SIZE 256
 
 struct ListBase;
@@ -127,7 +123,3 @@ void SEQ_render_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4
  * This function also checks `SeqTimelineChannel` flag.
  */
 bool SEQ_render_is_muted(const struct ListBase *channels, const struct Sequence *seq);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_select.h b/source/blender/sequencer/SEQ_select.hh
similarity index 87%
rename from source/blender/sequencer/SEQ_select.h
rename to source/blender/sequencer/SEQ_select.hh
index 9fc0c8e8f05..4a95f76600a 100644
--- a/source/blender/sequencer/SEQ_select.h
+++ b/source/blender/sequencer/SEQ_select.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Scene;
 struct Sequence;
 
@@ -20,7 +16,3 @@ bool SEQ_select_active_get_pair(struct Scene *scene,
                                 struct Sequence **r_seq_act,
                                 struct Sequence **r_seq_other);
 void SEQ_select_active_set(struct Scene *scene, struct Sequence *seq);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.hh
similarity index 98%
rename from source/blender/sequencer/SEQ_sequencer.h
rename to source/blender/sequencer/SEQ_sequencer.hh
index be758c16261..999e3e3c6d1 100644
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.hh
@@ -10,10 +10,6 @@
 
 #include "DNA_scene_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BlendDataReader;
 struct BlendLibReader;
 struct BlendWriter;
@@ -151,7 +147,3 @@ void SEQ_sequence_lookup_free(const struct Scene *scene);
  * \param tag: tag to set
  */
 void SEQ_sequence_lookup_tag(const struct Scene *scene, eSequenceLookupTag tag);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_sound.h b/source/blender/sequencer/SEQ_sound.hh
similarity index 97%
rename from source/blender/sequencer/SEQ_sound.h
rename to source/blender/sequencer/SEQ_sound.hh
index eb12d70e53c..c1c35c21374 100644
--- a/source/blender/sequencer/SEQ_sound.h
+++ b/source/blender/sequencer/SEQ_sound.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Main;
 struct Scene;
 struct Sequence;
@@ -61,7 +57,3 @@ typedef struct SoundModifierWorkerInfo {
   int type;
   void *(*recreator)(struct Sequence *seq, struct SequenceModifierData *smd, void *sound);
 } SoundModifierWorkerInfo;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_time.h b/source/blender/sequencer/SEQ_time.hh
similarity index 98%
rename from source/blender/sequencer/SEQ_time.h
rename to source/blender/sequencer/SEQ_time.hh
index 556764da18d..62ab1a7e81b 100644
--- a/source/blender/sequencer/SEQ_time.h
+++ b/source/blender/sequencer/SEQ_time.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Scene;
 struct Sequence;
@@ -134,6 +130,3 @@ void SEQ_time_start_frame_set(const struct Scene *scene, struct Sequence *seq, i
  * \note this function is currently only used internally and in versioning code.
  */
 void SEQ_time_update_meta_strip_range(const struct Scene *scene, struct Sequence *seq_meta);
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_transform.h b/source/blender/sequencer/SEQ_transform.hh
similarity index 98%
rename from source/blender/sequencer/SEQ_transform.h
rename to source/blender/sequencer/SEQ_transform.hh
index 595841bdf52..31a251fe85b 100644
--- a/source/blender/sequencer/SEQ_transform.h
+++ b/source/blender/sequencer/SEQ_transform.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Scene;
 struct SeqCollection;
@@ -135,7 +131,3 @@ void SEQ_image_transform_bounding_box_from_collection(struct Scene *scene,
                                                       bool apply_rotation,
                                                       float r_min[2],
                                                       float r_max[2]);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/SEQ_utils.h b/source/blender/sequencer/SEQ_utils.hh
similarity index 96%
rename from source/blender/sequencer/SEQ_utils.h
rename to source/blender/sequencer/SEQ_utils.hh
index 69025d04abd..337e5b4aaa2 100644
--- a/source/blender/sequencer/SEQ_utils.h
+++ b/source/blender/sequencer/SEQ_utils.hh
@@ -10,10 +10,6 @@
 
 #include "DNA_scene_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Mask;
 struct Scene;
@@ -57,6 +53,3 @@ void SEQ_set_scale_to_fit(const struct Sequence *seq,
  * \param scene: Scene in which name must be unique
  */
 void SEQ_ensure_unique_name(struct Sequence *seq, struct Scene *scene);
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/animation.cc b/source/blender/sequencer/intern/animation.cc
index 64ba1f57470..1174d93665e 100644
--- a/source/blender/sequencer/intern/animation.cc
+++ b/source/blender/sequencer/intern/animation.cc
@@ -21,7 +21,7 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "SEQ_animation.h"
+#include "SEQ_animation.hh"
 
 bool SEQ_animation_curves_exist(Scene *scene)
 {
diff --git a/source/blender/sequencer/intern/channels.cc b/source/blender/sequencer/intern/channels.cc
index fb54cc3c156..851854c1d5e 100644
--- a/source/blender/sequencer/intern/channels.cc
+++ b/source/blender/sequencer/intern/channels.cc
@@ -16,10 +16,10 @@
 
 #include "BLI_blenlib.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
 
 ListBase *SEQ_channels_displayed_get(Editing *ed)
 {
diff --git a/source/blender/sequencer/intern/clipboard.cc b/source/blender/sequencer/intern/clipboard.cc
index 2b98c70bea0..a3398d464f7 100644
--- a/source/blender/sequencer/intern/clipboard.cc
+++ b/source/blender/sequencer/intern/clipboard.cc
@@ -26,10 +26,10 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "SEQ_clipboard.h"
-#include "SEQ_select.h"
+#include "SEQ_clipboard.hh"
+#include "SEQ_select.hh"
 
-#include "sequencer.h"
+#include "sequencer.hh"
 
 #ifdef WITH_AUDASPACE
 #  include <AUD_Special.h>
diff --git a/source/blender/sequencer/intern/disk_cache.cc b/source/blender/sequencer/intern/disk_cache.cc
index c3b13b6133f..37e6580879b 100644
--- a/source/blender/sequencer/intern/disk_cache.cc
+++ b/source/blender/sequencer/intern/disk_cache.cc
@@ -34,16 +34,16 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
-#include "disk_cache.h"
-#include "image_cache.h"
-#include "prefetch.h"
-#include "strip_time.h"
+#include "disk_cache.hh"
+#include "image_cache.hh"
+#include "prefetch.hh"
+#include "strip_time.hh"
 
 /**
  * Disk Cache Design Notes
diff --git a/source/blender/sequencer/intern/disk_cache.h b/source/blender/sequencer/intern/disk_cache.hh
similarity index 94%
rename from source/blender/sequencer/intern/disk_cache.h
rename to source/blender/sequencer/intern/disk_cache.hh
index 1c9e9dfee8f..ec5a4f233d9 100644
--- a/source/blender/sequencer/intern/disk_cache.h
+++ b/source/blender/sequencer/intern/disk_cache.hh
@@ -12,10 +12,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ImBuf;
 struct Main;
 struct Scene;
@@ -36,6 +32,3 @@ void seq_disk_cache_invalidate(struct SeqDiskCache *disk_cache,
                                struct Sequence *seq,
                                struct Sequence *seq_changed,
                                int invalidate_types);
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc
index 2649c349fb8..8bffd997ddf 100644
--- a/source/blender/sequencer/intern/effects.cc
+++ b/source/blender/sequencer/intern/effects.cc
@@ -45,20 +45,20 @@
 
 #include "RE_pipeline.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_time.h"
-#include "SEQ_utils.h"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_time.hh"
+#include "SEQ_utils.hh"
 
 #include "BLF_api.h"
 
-#include "effects.h"
-#include "render.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "effects.hh"
+#include "render.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 static SeqEffectHandle get_sequence_effect_impl(int seq_type);
 
diff --git a/source/blender/sequencer/intern/effects.h b/source/blender/sequencer/intern/effects.hh
similarity index 89%
rename from source/blender/sequencer/intern/effects.h
rename to source/blender/sequencer/intern/effects.hh
index 2ac91e6b778..e393adb0149 100644
--- a/source/blender/sequencer/intern/effects.h
+++ b/source/blender/sequencer/intern/effects.hh
@@ -8,11 +8,7 @@
  * \ingroup sequencer
  */
 
-#include "SEQ_effects.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "SEQ_effects.hh"
 
 struct Scene;
 struct Sequence;
@@ -30,7 +26,3 @@ float seq_speed_effect_target_frame_get(struct Scene *scene,
                                         struct Sequence *seq,
                                         float timeline_frame,
                                         int input);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/image_cache.cc b/source/blender/sequencer/intern/image_cache.cc
index 53100ab7b14..3d96b953d7a 100644
--- a/source/blender/sequencer/intern/image_cache.cc
+++ b/source/blender/sequencer/intern/image_cache.cc
@@ -34,15 +34,16 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
-#include "disk_cache.h"
-#include "image_cache.h"
-#include "prefetch.h"
-#include "strip_time.h"
+#include "disk_cache.hh"
+#include "image_cache.hh"
+#include "prefetch.hh"
+#include "strip_time.hh"
 
 /**
  * Sequencer Cache Design Notes
diff --git a/source/blender/sequencer/intern/image_cache.h b/source/blender/sequencer/intern/image_cache.hh
similarity index 95%
rename from source/blender/sequencer/intern/image_cache.h
rename to source/blender/sequencer/intern/image_cache.hh
index ddcd1eec926..c848f66b763 100644
--- a/source/blender/sequencer/intern/image_cache.h
+++ b/source/blender/sequencer/intern/image_cache.hh
@@ -8,11 +8,7 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "SEQ_render.h" /* Needed for #eSeqTaskId. */
+#include "SEQ_render.hh" /* Needed for #eSeqTaskId. */
 
 struct ImBuf;
 struct Main;
@@ -71,7 +67,3 @@ void seq_cache_cleanup_sequence(struct Scene *scene,
 void seq_cache_thumbnail_cleanup(Scene *scene, rctf *view_area);
 bool seq_cache_is_full(void);
 float seq_cache_frame_index_to_timeline_frame(struct Sequence *seq, float frame_index);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/iterator.cc b/source/blender/sequencer/intern/iterator.cc
index 66b94fb3f5c..7186ced845f 100644
--- a/source/blender/sequencer/intern/iterator.cc
+++ b/source/blender/sequencer/intern/iterator.cc
@@ -20,11 +20,11 @@
 
 #include "BKE_scene.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_time.h"
-#include "render.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_time.hh"
+#include "render.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Iterator API
diff --git a/source/blender/sequencer/intern/modifier.cc b/source/blender/sequencer/intern/modifier.cc
index e28348dd402..857585ce356 100644
--- a/source/blender/sequencer/intern/modifier.cc
+++ b/source/blender/sequencer/intern/modifier.cc
@@ -28,13 +28,13 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "SEQ_modifier.h"
-#include "SEQ_render.h"
-#include "SEQ_sound.h"
+#include "SEQ_modifier.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sound.hh"
 
 #include "BLO_read_write.hh"
 
-#include "render.h"
+#include "render.hh"
 
 static SequenceModifierTypeInfo *modifiersTypes[NUM_SEQUENCE_MODIFIER_TYPES];
 static bool modifierTypesInit = false;
diff --git a/source/blender/sequencer/intern/multiview.cc b/source/blender/sequencer/intern/multiview.cc
index ee80f9ddb44..5dbb86956de 100644
--- a/source/blender/sequencer/intern/multiview.cc
+++ b/source/blender/sequencer/intern/multiview.cc
@@ -16,7 +16,7 @@
 
 #include "IMB_imbuf.h"
 
-#include "multiview.h"
+#include "multiview.hh"
 
 void seq_anim_add_suffix(Scene *scene, anim *anim, const int view_id)
 {
diff --git a/source/blender/sequencer/intern/multiview.h b/source/blender/sequencer/intern/multiview.hh
similarity index 100%
rename from source/blender/sequencer/intern/multiview.h
rename to source/blender/sequencer/intern/multiview.hh
diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc
index 1c55c1fc73c..a7f800ea877 100644
--- a/source/blender/sequencer/intern/prefetch.cc
+++ b/source/blender/sequencer/intern/prefetch.cc
@@ -38,16 +38,16 @@
 #include "DEG_depsgraph_debug.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
 
-#include "image_cache.h"
-#include "prefetch.h"
-#include "render.h"
+#include "image_cache.hh"
+#include "prefetch.hh"
+#include "render.hh"
 
 struct PrefetchJob {
   PrefetchJob *next, *prev;
diff --git a/source/blender/sequencer/intern/prefetch.h b/source/blender/sequencer/intern/prefetch.hh
similarity index 91%
rename from source/blender/sequencer/intern/prefetch.h
rename to source/blender/sequencer/intern/prefetch.hh
index 58d1b1f686f..9e1875be56b 100644
--- a/source/blender/sequencer/intern/prefetch.h
+++ b/source/blender/sequencer/intern/prefetch.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Scene;
 struct SeqRenderData;
 struct Sequence;
@@ -31,7 +27,3 @@ struct SeqRenderData *seq_prefetch_get_original_context(const struct SeqRenderDa
  * For cache context swapping.
  */
 struct Sequence *seq_prefetch_get_original_sequence(struct Sequence *seq, struct Scene *scene);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/proxy.cc b/source/blender/sequencer/intern/proxy.cc
index 9562eb4a8d7..bd4742f5072 100644
--- a/source/blender/sequencer/intern/proxy.cc
+++ b/source/blender/sequencer/intern/proxy.cc
@@ -41,19 +41,19 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
 
-#include "multiview.h"
-#include "proxy.h"
-#include "render.h"
-#include "sequencer.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "multiview.hh"
+#include "proxy.hh"
+#include "render.hh"
+#include "sequencer.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 struct SeqIndexBuildContext {
   IndexBuildContext *index_context;
diff --git a/source/blender/sequencer/intern/proxy.h b/source/blender/sequencer/intern/proxy.hh
similarity index 90%
rename from source/blender/sequencer/intern/proxy.h
rename to source/blender/sequencer/intern/proxy.hh
index eaba75f1b2a..cbb12ff16dd 100644
--- a/source/blender/sequencer/intern/proxy.h
+++ b/source/blender/sequencer/intern/proxy.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ImBuf;
 struct SeqRenderData;
 struct Sequence;
@@ -24,7 +20,3 @@ struct ImBuf *seq_proxy_fetch(const struct SeqRenderData *context,
 bool seq_proxy_get_custom_file_filepath(struct Sequence *seq, char *name, int view_id);
 void free_proxy_seq(Sequence *seq);
 void seq_proxy_index_dir_set(struct anim *anim, const char *base_dir);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/proxy_job.cc b/source/blender/sequencer/intern/proxy_job.cc
index 49af62ad688..dfda370330d 100644
--- a/source/blender/sequencer/intern/proxy_job.cc
+++ b/source/blender/sequencer/intern/proxy_job.cc
@@ -22,10 +22,10 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc
index 434cb75fb20..6f3101ea2e9 100644
--- a/source/blender/sequencer/intern/render.cc
+++ b/source/blender/sequencer/intern/render.cc
@@ -54,26 +54,26 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_channels.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
-#include "effects.h"
-#include "image_cache.h"
-#include "multiview.h"
-#include "prefetch.h"
-#include "proxy.h"
-#include "render.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "effects.hh"
+#include "image_cache.hh"
+#include "multiview.hh"
+#include "prefetch.hh"
+#include "proxy.hh"
+#include "render.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 static ImBuf *seq_render_strip_stack(const SeqRenderData *context,
                                      SeqRenderState *state,
diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.hh
similarity index 100%
rename from source/blender/sequencer/intern/render.h
rename to source/blender/sequencer/intern/render.hh
diff --git a/source/blender/sequencer/intern/sequence_lookup.cc b/source/blender/sequencer/intern/sequence_lookup.cc
index 3fbc1dfbb98..5544e783373 100644
--- a/source/blender/sequencer/intern/sequence_lookup.cc
+++ b/source/blender/sequencer/intern/sequence_lookup.cc
@@ -6,14 +6,14 @@
  * \ingroup sequencer
  */
 
-#include "SEQ_sequencer.h"
-#include "sequencer.h"
+#include "SEQ_sequencer.hh"
+#include "sequencer.hh"
 
 #include "DNA_listBase.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
-#include "SEQ_iterator.h"
+#include "SEQ_iterator.hh"
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc
index 8c1f6df6432..38583c63b78 100644
--- a/source/blender/sequencer/intern/sequencer.cc
+++ b/source/blender/sequencer/intern/sequencer.cc
@@ -31,26 +31,26 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_modifier.h"
-#include "SEQ_proxy.h"
-#include "SEQ_relations.h"
+#include "SEQ_channels.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_modifier.hh"
+#include "SEQ_proxy.hh"
+#include "SEQ_relations.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_sound.h"
-#include "SEQ_time.h"
-#include "SEQ_utils.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_sound.hh"
+#include "SEQ_time.hh"
+#include "SEQ_utils.hh"
 
 #include "BLO_read_write.hh"
 
-#include "image_cache.h"
-#include "prefetch.h"
-#include "sequencer.h"
-#include "utils.h"
+#include "image_cache.hh"
+#include "prefetch.hh"
+#include "sequencer.hh"
+#include "utils.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Allocate / Free Functions
diff --git a/source/blender/sequencer/intern/sequencer.h b/source/blender/sequencer/intern/sequencer.hh
similarity index 100%
rename from source/blender/sequencer/intern/sequencer.h
rename to source/blender/sequencer/intern/sequencer.hh
diff --git a/source/blender/sequencer/intern/sound.cc b/source/blender/sequencer/intern/sound.cc
index 78d7f3a84c2..293e3a8cadd 100644
--- a/source/blender/sequencer/intern/sound.cc
+++ b/source/blender/sequencer/intern/sound.cc
@@ -32,11 +32,11 @@
 #  include "AUD_Sound.h"
 #endif
 
-#include "SEQ_sound.h"
-#include "SEQ_time.h"
+#include "SEQ_sound.hh"
+#include "SEQ_time.hh"
 
-#include "sequencer.h"
-#include "strip_time.h"
+#include "sequencer.hh"
+#include "strip_time.hh"
 
 /* Unlike _update_sound_ functions,
  * these ones take info from audaspace to update sequence length! */
diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc
index 941b8e85c0d..f890963fec0 100644
--- a/source/blender/sequencer/intern/strip_add.cc
+++ b/source/blender/sequencer/intern/strip_add.cc
@@ -39,22 +39,22 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
-#include "SEQ_add.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_add.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
-#include "multiview.h"
-#include "proxy.h"
-#include "sequencer.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "multiview.hh"
+#include "proxy.hh"
+#include "sequencer.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 void SEQ_add_load_data_init(SeqLoadData *load_data,
                             const char *name,
diff --git a/source/blender/sequencer/intern/strip_edit.cc b/source/blender/sequencer/intern/strip_edit.cc
index 0df5602ea39..9441eaf4699 100644
--- a/source/blender/sequencer/intern/strip_edit.cc
+++ b/source/blender/sequencer/intern/strip_edit.cc
@@ -23,21 +23,21 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "strip_time.h"
-#include "utils.h"
+#include "strip_time.hh"
+#include "utils.hh"
 
-#include "SEQ_add.h"
-#include "SEQ_animation.h"
-#include "SEQ_channels.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
-#include "SEQ_utils.h"
+#include "SEQ_add.hh"
+#include "SEQ_animation.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
+#include "SEQ_utils.hh"
 
 #include <cstring>
 
diff --git a/source/blender/sequencer/intern/strip_relations.cc b/source/blender/sequencer/intern/strip_relations.cc
index d8d3cacc058..b74317473ed 100644
--- a/source/blender/sequencer/intern/strip_relations.cc
+++ b/source/blender/sequencer/intern/strip_relations.cc
@@ -25,16 +25,16 @@
 
 #include "IMB_imbuf.h"
 
-#include "SEQ_iterator.h"
-#include "SEQ_prefetch.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_iterator.hh"
+#include "SEQ_prefetch.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
-#include "effects.h"
-#include "image_cache.h"
-#include "utils.h"
+#include "effects.hh"
+#include "image_cache.hh"
+#include "utils.hh"
 
 bool SEQ_relation_is_effect_of_strip(const Sequence *effect, const Sequence *input)
 {
diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc
index 7b20e8870ae..5e08e113e8c 100644
--- a/source/blender/sequencer/intern/strip_retiming.cc
+++ b/source/blender/sequencer/intern/strip_retiming.cc
@@ -30,18 +30,18 @@
 
 #include "RNA_prototypes.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
-#include "sequencer.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "sequencer.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 using blender::MutableSpan;
 
diff --git a/source/blender/sequencer/intern/strip_select.cc b/source/blender/sequencer/intern/strip_select.cc
index 67f74109d68..d08cfa7771c 100644
--- a/source/blender/sequencer/intern/strip_select.cc
+++ b/source/blender/sequencer/intern/strip_select.cc
@@ -13,8 +13,8 @@
 
 #include "BKE_scene.h"
 
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
 
 Sequence *SEQ_select_active_get(Scene *scene)
 {
diff --git a/source/blender/sequencer/intern/strip_time.cc b/source/blender/sequencer/intern/strip_time.cc
index b453376db2b..ef479e8fd04 100644
--- a/source/blender/sequencer/intern/strip_time.cc
+++ b/source/blender/sequencer/intern/strip_time.cc
@@ -28,18 +28,18 @@
 
 #include "RNA_prototypes.h"
 
-#include "SEQ_channels.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
+#include "SEQ_channels.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
 #include "SEQ_retiming.hh"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
-#include "sequencer.h"
-#include "strip_time.h"
-#include "utils.h"
+#include "sequencer.hh"
+#include "strip_time.hh"
+#include "utils.hh"
 
 float seq_time_media_playback_rate_factor_get(const Scene *scene, const Sequence *seq)
 {
diff --git a/source/blender/sequencer/intern/strip_time.h b/source/blender/sequencer/intern/strip_time.hh
similarity index 96%
rename from source/blender/sequencer/intern/strip_time.h
rename to source/blender/sequencer/intern/strip_time.hh
index 8b7306445bb..ab8e35b6c6d 100644
--- a/source/blender/sequencer/intern/strip_time.h
+++ b/source/blender/sequencer/intern/strip_time.hh
@@ -8,10 +8,6 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Scene;
 struct Sequence;
@@ -49,7 +45,3 @@ float seq_time_media_playback_rate_factor_get(const struct Scene *scene,
 int seq_time_strip_original_content_length_get(const struct Scene *scene,
                                                const struct Sequence *seq);
 float seq_retiming_evaluate(const struct Sequence *seq, const float frame_index);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/sequencer/intern/strip_transform.cc b/source/blender/sequencer/intern/strip_transform.cc
index 10ee23bba8e..8fe4ac90b55 100644
--- a/source/blender/sequencer/intern/strip_transform.cc
+++ b/source/blender/sequencer/intern/strip_transform.cc
@@ -21,18 +21,18 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "SEQ_animation.h"
-#include "SEQ_channels.h"
-#include "SEQ_edit.h"
-#include "SEQ_effects.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_transform.h"
+#include "SEQ_animation.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_effects.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_transform.hh"
 
-#include "sequencer.h"
-#include "strip_time.h"
+#include "sequencer.hh"
+#include "strip_time.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/sequencer/intern/utils.cc b/source/blender/sequencer/intern/utils.cc
index 18496dc3540..3cda9779ab8 100644
--- a/source/blender/sequencer/intern/utils.cc
+++ b/source/blender/sequencer/intern/utils.cc
@@ -26,24 +26,24 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "SEQ_animation.h"
-#include "SEQ_channels.h"
-#include "SEQ_edit.h"
-#include "SEQ_iterator.h"
-#include "SEQ_relations.h"
-#include "SEQ_render.h"
-#include "SEQ_select.h"
-#include "SEQ_sequencer.h"
-#include "SEQ_time.h"
-#include "SEQ_utils.h"
+#include "SEQ_animation.hh"
+#include "SEQ_channels.hh"
+#include "SEQ_edit.hh"
+#include "SEQ_iterator.hh"
+#include "SEQ_relations.hh"
+#include "SEQ_render.hh"
+#include "SEQ_select.hh"
+#include "SEQ_sequencer.hh"
+#include "SEQ_time.hh"
+#include "SEQ_utils.hh"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "multiview.h"
-#include "proxy.h"
-#include "sequencer.h"
-#include "utils.h"
+#include "multiview.hh"
+#include "proxy.hh"
+#include "sequencer.hh"
+#include "utils.hh"
 
 struct SeqUniqueInfo {
   Sequence *seq;
diff --git a/source/blender/sequencer/intern/utils.h b/source/blender/sequencer/intern/utils.hh
similarity index 85%
rename from source/blender/sequencer/intern/utils.h
rename to source/blender/sequencer/intern/utils.hh
index d4860e417b8..7104723204a 100644
--- a/source/blender/sequencer/intern/utils.h
+++ b/source/blender/sequencer/intern/utils.hh
@@ -8,17 +8,9 @@
  * \ingroup sequencer
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ListBase;
 struct Scene;
 
 bool sequencer_seq_generates_image(struct Sequence *seq);
 void seq_open_anim_file(struct Scene *scene, struct Sequence *seq, bool openfile);
 Sequence *SEQ_get_meta_by_seqbase(struct ListBase *seqbase_main, struct ListBase *meta_seqbase);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc
index b733529e977..9dbe733594d 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -68,7 +68,7 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h" /* RE_ free stuff */
 
-#include "SEQ_clipboard.h" /* free seq clipboard */
+#include "SEQ_clipboard.hh" /* free seq clipboard */
 
 #include "IMB_thumbs.h"
 
diff --git a/source/blender/windowmanager/intern/wm_jobs.cc b/source/blender/windowmanager/intern/wm_jobs.cc
index 4e66f4b992b..2f31c473253 100644
--- a/source/blender/windowmanager/intern/wm_jobs.cc
+++ b/source/blender/windowmanager/intern/wm_jobs.cc
@@ -22,7 +22,7 @@
 #include "BKE_global.h"
 #include "BKE_report.h"
 
-#include "SEQ_prefetch.h"
+#include "SEQ_prefetch.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"