diff --git a/src/manager.cpp b/src/manager.cpp
index 010c9ccd3e95d3b89c4de42d2b69ca89cdccc561..c5462e694601ae8b0adb9121bb72735e11eb0def 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -77,6 +77,7 @@ using random_device = dht::crypto::random_device;
 
 #include "libav_utils.h"
 #include "video/sinkclient.h"
+#include "audio/tonecontrol.h"
 
 #include <cerrno>
 #include <ctime>
diff --git a/src/manager.h b/src/manager.h
index 66b818de4b08a8544e8b22725d6f060e4d8d766b..79326fa2fe752832765ece2f11c23f4387bd3097 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -42,10 +42,6 @@
 #include <atomic>
 #include <functional>
 
-#include "conference.h"
-
-#include "audio/audiolayer.h"
-#include "audio/tonecontrol.h"
 namespace ring {
 
 namespace video {
@@ -53,6 +49,8 @@ class SinkClient;
 }
 class RingBufferPool;
 class VideoManager;
+class Conference;
+class AudioLoop;
 
 /** Manager (controller) of Ring daemon */
 class Manager {
diff --git a/src/media/audio/alsa/alsalayer.cpp b/src/media/audio/alsa/alsalayer.cpp
index 584a05b922e949fe6ab1cb153b13b3342cab4b56..76f9171c4ac934696643e63d86a06f4031639e8b 100644
--- a/src/media/audio/alsa/alsalayer.cpp
+++ b/src/media/audio/alsa/alsalayer.cpp
@@ -28,6 +28,7 @@
 #include "audio/ringbufferpool.h"
 #include "audio/ringbuffer.h"
 #include "audio/resampler.h"
+#include "audio/audioloop.h"
 
 #include <thread>
 #include <atomic>
diff --git a/src/media/audio/audiolayer.cpp b/src/media/audio/audiolayer.cpp
index 683d7ce918da5038174fda3657dc15c2016bdec8..862c074a043a7070643f4f6b5f2ab1f66b5d4483 100644
--- a/src/media/audio/audiolayer.cpp
+++ b/src/media/audio/audiolayer.cpp
@@ -25,6 +25,7 @@
 #include "manager.h"
 #include "audio/ringbufferpool.h"
 #include "audio/resampler.h"
+#include "tonecontrol.h"
 #include "client/ring_signal.h"
 
 #include <ctime>
diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp
index 72541e308f63c8ae46c98bb44e82cc3901fcd62b..ef1151ee59548f31ed6494ead1fe27a0255c1a7d 100644
--- a/src/media/audio/portaudio/portaudiolayer.cpp
+++ b/src/media/audio/portaudio/portaudiolayer.cpp
@@ -25,6 +25,7 @@
 #include "audio/resampler.h"
 #include "audio/ringbufferpool.h"
 #include "audio/ringbuffer.h"
+#include "audio/audioloop.h"
 
 #include <portaudio.h>
 #include <algorithm>
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index c031540a8fa6d92913cb9bc53b38f2def190c908..f37ef9e33572e25ced687e72c5ea81e12a869b22 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -31,6 +31,7 @@
 #include "logger.h"
 #include "string_utils.h"
 #include "call.h"
+#include "conference.h"
 
 #include "account_const.h"