18 files changed, 57 insertions, 26 deletions
diff --git a/source/blender/sequencer/intern/clipboard.c b/source/blender/sequencer/intern/clipboard.c
index 7a9a06a744a..29cb749bc99 100644
--- a/source/blender/sequencer/intern/clipboard.c
+++ b/source/blender/sequencer/intern/clipboard.c
@@ -37,7 +37,7 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_clipboard.h"
 
 #include "sequencer.h"
 
diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 58dd6d6e048..e8e80c8da83 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -59,7 +59,10 @@
 
 #include "RE_pipeline.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_effects.h"
+#include "SEQ_proxy.h"
+#include "SEQ_render.h"
+#include "SEQ_utils.h"
 
 #include "BLF_api.h"
 
diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c
index 6eb12df7186..2fe59f52bf4 100644
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@ -48,6 +48,9 @@
 #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 "image_cache.h"
diff --git a/source/blender/sequencer/intern/iterator.c b/source/blender/sequencer/intern/iterator.c
index 7d54795b150..bb4982d1468 100644
--- a/source/blender/sequencer/intern/iterator.c
+++ b/source/blender/sequencer/intern/iterator.c
@@ -35,7 +35,7 @@
 
 #include "BKE_scene.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
 
 /* ************************* iterator ************************** */
 /* *************** (replaces old WHILE_SEQ) ********************* */
diff --git a/source/blender/sequencer/intern/modifier.c b/source/blender/sequencer/intern/modifier.c
index 99fa228e7a5..b6f56025e6b 100644
--- a/source/blender/sequencer/intern/modifier.c
+++ b/source/blender/sequencer/intern/modifier.c
@@ -44,7 +44,8 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_modifier.h"
+#include "SEQ_render.h"
 
 #include "BLO_read_write.h"
 
diff --git a/source/blender/sequencer/intern/prefetch.c b/source/blender/sequencer/intern/prefetch.c
index 5d769a18a19..5ffb2287e1c 100644
--- a/source/blender/sequencer/intern/prefetch.c
+++ b/source/blender/sequencer/intern/prefetch.c
@@ -53,7 +53,8 @@
 #include "DEG_depsgraph_debug.h"
 #include "DEG_depsgraph_query.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_prefetch.h"
+#include "SEQ_render.h"
 
 #include "image_cache.h"
 #include "prefetch.h"
diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index 72dc9708ccb..22d8daba696 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -54,6 +54,8 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
+#include "SEQ_proxy.h"
+#include "SEQ_render.h"
 #include "SEQ_sequencer.h"
 
 #include "multiview.h"
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index 84f2a6df647..524bf7cd74c 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -64,7 +64,12 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
+#include "SEQ_effects.h"
+#include "SEQ_modifier.h"
+#include "SEQ_proxy.h"
+#include "SEQ_render.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_utils.h"
 
 #include "effects.h"
 #include "image_cache.h"
diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.h
index 46748415187..6875087df82 100644
--- a/source/blender/sequencer/intern/render.h
+++ b/source/blender/sequencer/intern/render.h
@@ -32,6 +32,7 @@ struct ListBase;
 struct Scene;
 struct SeqRenderData;
 struct Sequence;
+struct SeqEffectHandle;
 
 #define EARLY_NO_INPUT -1
 #define EARLY_DO_EFFECT 0
@@ -50,7 +51,7 @@ struct ImBuf *seq_render_give_ibuf_seqbase(const struct SeqRenderData *context,
                                            int chan_shown,
                                            struct ListBase *seqbasep);
 struct ImBuf *seq_render_effect_execute_threaded(struct SeqEffectHandle *sh,
-                                                 const SeqRenderData *context,
+                                                 const struct SeqRenderData *context,
                                                  struct Sequence *seq,
                                                  float timeline_frame,
                                                  float facf0,
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index 51495e7bf02..79e8ba2f6c0 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -44,7 +44,13 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
+#include "SEQ_effects.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
+#include "SEQ_relations.h"
+#include "SEQ_select.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_utils.h"
 
 #include "image_cache.h"
 #include "prefetch.h"
diff --git a/source/blender/sequencer/intern/sound.c b/source/blender/sequencer/intern/sound.c
index f62142d0112..1054dbeeba6 100644
--- a/source/blender/sequencer/intern/sound.c
+++ b/source/blender/sequencer/intern/sound.c
@@ -36,28 +36,11 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "SEQ_sequencer.h"
+#include "SEQ_sound.h"
+#include "SEQ_time.h"
 
 #include "strip_time.h"
 
-static void seq_sound_init(Scene *scene, Sequence *seq)
-{
-  if (seq->type == SEQ_TYPE_META) {
-    Sequence *seq_child;
-    for (seq_child = seq->seqbase.first; seq_child; seq_child = seq_child->next) {
-      seq_sound_init(scene, seq_child);
-    }
-  }
-  else {
-    if (seq->sound) {
-      seq->scene_sound = BKE_sound_add_scene_sound_defaults(scene, seq);
-    }
-    if (seq->scene) {
-      seq->scene_sound = BKE_sound_scene_add_scene_sound_defaults(scene, seq);
-    }
-  }
-}
-
 /* Unlike _update_sound_ funcs, these ones take info from audaspace to update sequence length! */
 #ifdef WITH_AUDASPACE
 static bool sequencer_refresh_sound_length_recursive(Main *bmain, Scene *scene, ListBase *seqbase)
diff --git a/source/blender/sequencer/intern/strip_add.c b/source/blender/sequencer/intern/strip_add.c
index 4fe02b7fdd2..ba080a07879 100644
--- a/source/blender/sequencer/intern/strip_add.c
+++ b/source/blender/sequencer/intern/strip_add.c
@@ -53,7 +53,13 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
+#include "SEQ_add.h"
+#include "SEQ_relations.h"
+#include "SEQ_select.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_time.h"
+#include "SEQ_transform.h"
+#include "SEQ_utils.h"
 
 #include "multiview.h"
 #include "proxy.h"
diff --git a/source/blender/sequencer/intern/strip_edit.c b/source/blender/sequencer/intern/strip_edit.c
index 11f42c5de9d..bba026057d2 100644
--- a/source/blender/sequencer/intern/strip_edit.c
+++ b/source/blender/sequencer/intern/strip_edit.c
@@ -40,7 +40,12 @@
 
 #include "strip_time.h"
 
+#include "SEQ_add.h"
+#include "SEQ_edit.h"
+#include "SEQ_effects.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_time.h"
+#include "SEQ_transform.h"
 
 int SEQ_edit_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
 {
@@ -124,7 +129,7 @@ static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, i
   }
 }
 
-void SEQ_sound_update_muting(Editing *ed)
+void SEQ_edit_update_muting(Editing *ed)
 {
   if (ed) {
     /* mute all sounds up to current metastack list */
diff --git a/source/blender/sequencer/intern/strip_relations.c b/source/blender/sequencer/intern/strip_relations.c
index 939cafb09fd..18ae21e3a65 100644
--- a/source/blender/sequencer/intern/strip_relations.c
+++ b/source/blender/sequencer/intern/strip_relations.c
@@ -40,7 +40,11 @@
 
 #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 "effects.h"
 #include "image_cache.h"
diff --git a/source/blender/sequencer/intern/strip_select.c b/source/blender/sequencer/intern/strip_select.c
index fbf28087825..58ae281ead1 100644
--- a/source/blender/sequencer/intern/strip_select.c
+++ b/source/blender/sequencer/intern/strip_select.c
@@ -29,6 +29,7 @@
 
 #include "BKE_scene.h"
 
+#include "SEQ_select.h"
 #include "SEQ_sequencer.h"
 
 Sequence *SEQ_select_active_get(Scene *scene)
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index a3b17a7c58c..c495ad6d8f1 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -36,7 +36,9 @@
 
 #include "IMB_imbuf.h"
 
+#include "SEQ_render.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_time.h"
 
 #include "strip_time.h"
 #include "utils.h"
diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c
index 0cf3940dc54..3a0ba36b795 100644
--- a/source/blender/sequencer/intern/strip_transform.c
+++ b/source/blender/sequencer/intern/strip_transform.c
@@ -33,7 +33,11 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
+#include "SEQ_effects.h"
+#include "SEQ_relations.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_time.h"
+#include "SEQ_transform.h"
 
 static int seq_tx_get_start(Sequence *seq)
 {
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c
index 40f2aca4714..a15465eb3c0 100644
--- a/source/blender/sequencer/intern/utils.c
+++ b/source/blender/sequencer/intern/utils.c
@@ -42,7 +42,11 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
+#include "SEQ_iterator.h"
+#include "SEQ_relations.h"
+#include "SEQ_select.h"
 #include "SEQ_sequencer.h"
+#include "SEQ_utils.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"