diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 41a8d42e57e..41b8276949d 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../shader_fx
   ../simulation
   ../windowmanager
-  ../editors/include
   ../../../intern/eigen
   ../../../intern/ghost
   ../../../intern/iksolver/extern
@@ -837,9 +836,12 @@ if(WITH_GTESTS)
     intern/tracking_test.cc
     intern/volume_test.cc
   )
+  set(TEST_INC
+    ../editors/include
+  )
   set(TEST_LIB
     ${LIB}
     bf_rna  # RNA_prototypes.hh
   )
-  blender_add_test_suite_lib(blenkernel "${TEST_SRC}" "${INC}" "${INC_SYS}" "${TEST_LIB}")
+  blender_add_test_suite_lib(blenkernel "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
 endif()
diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc
index 39f56887ccb..12f97138ece 100644
--- a/source/blender/blenkernel/intern/sound.cc
+++ b/source/blender/blenkernel/intern/sound.cc
@@ -52,8 +52,6 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "ED_screen.hh"
-
 #include "BLO_read_write.hh"
 
 #include "SEQ_sound.hh"
@@ -1032,12 +1030,6 @@ void BKE_sound_seek_scene(Main *bmain, Scene *scene)
     AUD_seekSynchronizer(scene->playback_handle, cur_time);
   }
 
-  if (animation_playing) {
-    /* Make sure that our animation timer updates are in sync with the sound. */
-    wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
-    ED_screen_animation_timer_reset(screen, wm);
-  }
-
   AUD_Device_unlock(sound_device);
 }
 
diff --git a/source/blender/editors/include/ED_screen.hh b/source/blender/editors/include/ED_screen.hh
index fb8fabde164..0bfce6ac0e4 100644
--- a/source/blender/editors/include/ED_screen.hh
+++ b/source/blender/editors/include/ED_screen.hh
@@ -335,7 +335,6 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen);
  */
 void ED_screen_animation_timer(bContext *C, int redraws, int sync, int enable);
 void ED_screen_animation_timer_update(bScreen *screen, int redraws);
-void ED_screen_animation_timer_reset(bScreen *screen, wmWindowManager *wm);
 void ED_screen_restore_temp_type(bContext *C, ScrArea *area);
 ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *area, int type);
 /**
diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc
index 3e4ae094139..e02a7acffc2 100644
--- a/source/blender/editors/screen/screen_edit.cc
+++ b/source/blender/editors/screen/screen_edit.cc
@@ -1912,27 +1912,6 @@ void ED_screen_animation_timer_update(bScreen *screen, int redraws)
   }
 }
 
-void ED_screen_animation_timer_reset(bScreen *screen, wmWindowManager *wm)
-{
-  BLI_assert(screen);
-  BLI_assert(screen->animtimer);
-  wmTimer *old_timer = screen->animtimer;
-  /* Simply recreate the timer as we will otherwise run into race condition issues as other
-   * timer functions will write to most of the timer variables.
-   */
-  wmWindow *win = old_timer->win;
-  const double time_step = old_timer->time_step;
-  const int event_type = old_timer->event_type;
-  ScreenAnimData *sad = static_cast<ScreenAnimData *>(
-      MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData"));
-  memcpy(sad, old_timer->customdata, sizeof(ScreenAnimData));
-
-  WM_event_timer_remove(wm, win, old_timer);
-
-  screen->animtimer = WM_event_timer_add(wm, win, event_type, time_step);
-  screen->animtimer->customdata = sad;
-}
-
 void ED_update_for_newframe(Main *bmain, Depsgraph *depsgraph)
 {
   Scene *scene = DEG_get_input_scene(depsgraph);