diff --git a/src/audio/audio.h b/src/audio/audio.h
index ea407192d..e9f3d3c2d 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.h
@@ -54,8 +54,6 @@
 
 #include "audio/types.h"
 
-extern int audio_init_state_ok;
-
 struct module;
 struct state_audio;
 
@@ -90,6 +88,8 @@ struct state_audio * audio_cfg_init(struct module *parent,
 extern "C" {
 #endif
 
+extern int audio_init_state_ok;
+
 void audio_start(struct state_audio *s);
 void audio_done(struct state_audio *s);
 void audio_join(struct state_audio *s);
diff --git a/src/audio/audio_capture.c b/src/audio/audio_capture.c
index 10b3a849e..f34cb212d 100644
--- a/src/audio/audio_capture.c
+++ b/src/audio/audio_capture.c
@@ -50,9 +50,8 @@
 #include "host.h"
 
 #include "audio/audio_capture.h"
-
-#include "audio/audio.h"
 #include "audio/capture/sdi.h"
+#include "audio/types.h"
 
 /* vidcap flags */
 #include "video_capture.h"
diff --git a/src/audio/audio_capture.h b/src/audio/audio_capture.h
index 0926492e0..39ff9f235 100644
--- a/src/audio/audio_capture.h
+++ b/src/audio/audio_capture.h
@@ -54,6 +54,7 @@ struct audio_capture_info {
 struct state_audio_capture;
 struct audio_frame;
 
+extern int audio_init_state_ok;
 
 void                        audio_capture_init_devices(void);
 void                        audio_capture_print_help(bool);
diff --git a/src/audio/audio_playback.c b/src/audio/audio_playback.c
index d85e2c06e..55cb86278 100644
--- a/src/audio/audio_playback.c
+++ b/src/audio/audio_playback.c
@@ -45,9 +45,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/playback/sdi.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
diff --git a/src/audio/audio_playback.h b/src/audio/audio_playback.h
index bc52e7e16..44ff88a2a 100644
--- a/src/audio/audio_playback.h
+++ b/src/audio/audio_playback.h
@@ -36,12 +36,16 @@
  */
 
 #include "../types.h"
-#include "audio/audio.h"
+
+struct audio_desc;
+struct audio_frame;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern int audio_init_state_ok;
+
 #define AUDIO_PLAYBACK_ABI_VERSION 5
 
 /** @anchor audio_playback_ctl_reqs
diff --git a/src/audio/capture/alsa.c b/src/audio/capture/alsa.c
index 9dd639113..911892374 100644
--- a/src/audio/capture/alsa.c
+++ b/src/audio/capture/alsa.c
@@ -55,8 +55,8 @@
 #ifdef HAVE_ALSA
 
 #include "alsa_common.h"
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 
 #include "debug.h"
diff --git a/src/audio/capture/coreaudio.m b/src/audio/capture/coreaudio.m
index fedb525d3..0cf961eda 100644
--- a/src/audio/capture/coreaudio.m
+++ b/src/audio/capture/coreaudio.m
@@ -50,9 +50,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/playback/coreaudio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
diff --git a/src/audio/capture/jack.c b/src/audio/capture/jack.c
index afa160aa7..574881455 100644
--- a/src/audio/capture/jack.c
+++ b/src/audio/capture/jack.c
@@ -47,8 +47,8 @@
 #include "debug.h"
 #include "host.h"
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "lib_common.h"
 #include "utils/ring_buffer.h"
diff --git a/src/audio/capture/portaudio.c b/src/audio/capture/portaudio.c
index 87be5d76c..d7ee04a2e 100644
--- a/src/audio/capture/portaudio.c
+++ b/src/audio/capture/portaudio.c
@@ -60,9 +60,9 @@
 
 #include <portaudio.h> /* from PortAudio API */
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/portaudio_common.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
diff --git a/src/audio/capture/sdi.cpp b/src/audio/capture/sdi.cpp
index 4be93cd4c..14385222b 100644
--- a/src/audio/capture/sdi.cpp
+++ b/src/audio/capture/sdi.cpp
@@ -41,9 +41,9 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "audio/audio.h" 
 #include "audio/audio_capture.h"
-#include "audio/capture/sdi.h" 
+#include "audio/capture/sdi.h"
+#include "audio/types.h"
 
 #include "debug.h"
 #include "host.h"
diff --git a/src/audio/capture/testcard.cpp b/src/audio/capture/testcard.cpp
index 56a1afafe..f214e791f 100644
--- a/src/audio/capture/testcard.cpp
+++ b/src/audio/capture/testcard.cpp
@@ -44,7 +44,7 @@
 #endif
 
 #include "audio/audio_capture.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "audio/wav_reader.h"
 #include "debug.h"
diff --git a/src/audio/capture/wasapi.cpp b/src/audio/capture/wasapi.cpp
index b66f10aa6..a77a2395e 100644
--- a/src/audio/capture/wasapi.cpp
+++ b/src/audio/capture/wasapi.cpp
@@ -40,7 +40,6 @@
 #include <string>
 #include <windows.h>
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/types.h"
 #include "debug.h"
diff --git a/src/audio/codec.h b/src/audio/codec.h
index d681e1feb..d456f1dbd 100644
--- a/src/audio/codec.h
+++ b/src/audio/codec.h
@@ -49,7 +49,7 @@
 #ifndef AUDIO_CODEC_H_
 #define AUDIO_CODEC_H_
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #define AUDIO_COMPRESS_ABI_VERSION 2
 
diff --git a/src/audio/echo.h b/src/audio/echo.h
index 3b1b44f25..e94c32b7f 100644
--- a/src/audio/echo.h
+++ b/src/audio/echo.h
@@ -49,12 +49,11 @@
 #ifndef _ECHO_H_
 #define _ECHO_H_
 
-#include "audio/audio.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct audio_frame;
 struct echo_cancellation;
 
 typedef struct echo_cancellation echo_cancellation_t;
diff --git a/src/audio/jack.c b/src/audio/jack.c
index 21d3cbeb4..24eddb1cc 100644
--- a/src/audio/jack.c
+++ b/src/audio/jack.c
@@ -52,8 +52,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/jack.h"
+#include "audio/types.h"
 #include "jack_common.h"
 #include "pthread.h"
 #include "rtp/rtp.h"
diff --git a/src/audio/playback/alsa.c b/src/audio/playback/alsa.c
index 13a54b431..136cc2f1b 100644
--- a/src/audio/playback/alsa.c
+++ b/src/audio/playback/alsa.c
@@ -52,8 +52,8 @@
 #include <string.h>
 
 #include "alsa_common.h"
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"
diff --git a/src/audio/playback/coreaudio.cpp b/src/audio/playback/coreaudio.cpp
index 121931c0a..be8bca6c8 100644
--- a/src/audio/playback/coreaudio.cpp
+++ b/src/audio/playback/coreaudio.cpp
@@ -57,9 +57,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/playback/coreaudio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "rang.hpp"
diff --git a/src/audio/playback/decklink.cpp b/src/audio/playback/decklink.cpp
index 192ec0b7f..0263f78d1 100644
--- a/src/audio/playback/decklink.cpp
+++ b/src/audio/playback/decklink.cpp
@@ -43,8 +43,8 @@
 
 #include <iostream>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "blackmagic_common.h"
 #include "debug.h"
diff --git a/src/audio/playback/dummy.cpp b/src/audio/playback/dummy.cpp
index b4ae87514..10fe88bc9 100644
--- a/src/audio/playback/dummy.cpp
+++ b/src/audio/playback/dummy.cpp
@@ -41,8 +41,8 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "lib_common.h"
 
 static int state;
diff --git a/src/audio/playback/jack.c b/src/audio/playback/jack.c
index 5a5c8730e..8041e57ad 100644
--- a/src/audio/playback/jack.c
+++ b/src/audio/playback/jack.c
@@ -46,8 +46,8 @@
 #define MAX_PORTS 64
 #define MOD_NAME "[JACK playback] "
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
diff --git a/src/audio/playback/mixer.cpp b/src/audio/playback/mixer.cpp
index a96dce9f2..871bfa15a 100644
--- a/src/audio/playback/mixer.cpp
+++ b/src/audio/playback/mixer.cpp
@@ -42,10 +42,10 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/audio_playback.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "module.h"
diff --git a/src/audio/playback/none.c b/src/audio/playback/none.c
index 17dc131a4..2d3dacae8 100644
--- a/src/audio/playback/none.c
+++ b/src/audio/playback/none.c
@@ -41,8 +41,8 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include <stdlib.h>
diff --git a/src/audio/playback/portaudio.cpp b/src/audio/playback/portaudio.cpp
index 932ced805..a32627721 100644
--- a/src/audio/playback/portaudio.cpp
+++ b/src/audio/playback/portaudio.cpp
@@ -62,9 +62,9 @@
 
 #include <portaudio.h> /* from PortAudio */
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/portaudio_common.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "utils/audio_buffer.h"
diff --git a/src/audio/playback/wasapi.cpp b/src/audio/playback/wasapi.cpp
index 2fda927b0..9d31aff63 100644
--- a/src/audio/playback/wasapi.cpp
+++ b/src/audio/playback/wasapi.cpp
@@ -43,6 +43,7 @@
 #include <windows.h>
 
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "rang.hpp"
diff --git a/src/audio/types.cpp b/src/audio/types.cpp
index 7d3c39f9d..a7a9091c7 100644
--- a/src/audio/types.cpp
+++ b/src/audio/types.cpp
@@ -42,7 +42,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #ifdef HAVE_SPEEXDSP
diff --git a/src/audio/utils.cpp b/src/audio/utils.cpp
index 653838238..8d8b4be61 100644
--- a/src/audio/utils.cpp
+++ b/src/audio/utils.cpp
@@ -42,9 +42,9 @@
 #endif // HAVE_CONFIG_H
 
 
-#include "audio/audio.h"
 #include "audio/codec.h"
-#include "audio/utils.h" 
+#include "audio/types.h"
+#include "audio/utils.h"
 #include "debug.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/src/audio/utils.h b/src/audio/utils.h
index 3469c5cea..0f4eaa54b 100644
--- a/src/audio/utils.h
+++ b/src/audio/utils.h
@@ -47,7 +47,7 @@
 #include <stdint.h>
 #endif
 
-#include <audio/audio.h>
+#include "audio/types.h"
 
 #ifdef __cplusplus
 double calculate_rms(audio_frame2 *frame, int channel, double *peak);
diff --git a/src/rtp/audio_decoders.cpp b/src/rtp/audio_decoders.cpp
index f336c88c1..b0db03562 100644
--- a/src/rtp/audio_decoders.cpp
+++ b/src/rtp/audio_decoders.cpp
@@ -55,9 +55,9 @@
 #include "rtp/ptime.h"
 #include "rtp/pbuf.h"
 #include "rtp/audio_decoders.h"
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "crypto/crc.h"
 #include "crypto/openssl_decrypt.h"
diff --git a/src/rtp/audio_decoders.h b/src/rtp/audio_decoders.h
index 689933579..da3789c1c 100644
--- a/src/rtp/audio_decoders.h
+++ b/src/rtp/audio_decoders.h
@@ -35,8 +35,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "audio/audio.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/rtp/pbuf.h b/src/rtp/pbuf.h
index 76d0299c6..e57274e8a 100644
--- a/src/rtp/pbuf.h
+++ b/src/rtp/pbuf.h
@@ -59,7 +59,7 @@
 /* Internet" Figure 6.8 (page 167) for a diagram.                       [csp] */
 /******************************************************************************/
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "rtp/rtp.h"
 
 #ifdef __cplusplus
diff --git a/src/rtsp/BasicRTSPOnlyServer.hh b/src/rtsp/BasicRTSPOnlyServer.hh
index f01637b4b..a437eaacc 100644
--- a/src/rtsp/BasicRTSPOnlyServer.hh
+++ b/src/rtsp/BasicRTSPOnlyServer.hh
@@ -48,7 +48,7 @@
 #include <RTSPServer.hh>
 #include <BasicUsageEnvironment.hh>
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 
 
diff --git a/src/rtsp/BasicRTSPOnlySubsession.hh b/src/rtsp/BasicRTSPOnlySubsession.hh
index 6aab5aeaa..3eb2b3805 100644
--- a/src/rtsp/BasicRTSPOnlySubsession.hh
+++ b/src/rtsp/BasicRTSPOnlySubsession.hh
@@ -49,7 +49,7 @@
 #endif
 
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 #include "control_socket.h"
 
diff --git a/src/rtsp/c_basicRTSPOnlyServer.h b/src/rtsp/c_basicRTSPOnlyServer.h
index cdc8e3df5..8a9794e9a 100644
--- a/src/rtsp/c_basicRTSPOnlyServer.h
+++ b/src/rtsp/c_basicRTSPOnlyServer.h
@@ -56,7 +56,7 @@
 #include "module.h"
 #include "debug.h"
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 
 
 #ifdef __cplusplus
diff --git a/src/transmit.cpp b/src/transmit.cpp
index f25153d8a..1daebd89c 100644
--- a/src/transmit.cpp
+++ b/src/transmit.cpp
@@ -62,8 +62,8 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "audio/audio.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "crypto/random.h"
 #include "debug.h"
diff --git a/src/transmit.h b/src/transmit.h
index 8f39e708f..81f40569d 100644
--- a/src/transmit.h
+++ b/src/transmit.h
@@ -57,7 +57,7 @@
 #ifndef TRANSMIT_H_
 #define TRANSMIT_H_
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "rtp/rtpenc_h264.h"
 #include "types.h"
 
diff --git a/src/video_capture/aggregate.c b/src/video_capture/aggregate.c
index 10dff7b37..045adf153 100644
--- a/src/video_capture/aggregate.c
+++ b/src/video_capture/aggregate.c
@@ -48,7 +48,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video_capture/aja.cpp b/src/video_capture/aja.cpp
index 442b31688..cc51a4b88 100644
--- a/src/video_capture/aja.cpp
+++ b/src/video_capture/aja.cpp
@@ -53,7 +53,7 @@
 #include <winsock2.h>
 #endif
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
diff --git a/src/video_capture/aja_win32_utils.cpp b/src/video_capture/aja_win32_utils.cpp
index 7e92a2c7a..fd28392ab 100644
--- a/src/video_capture/aja_win32_utils.cpp
+++ b/src/video_capture/aja_win32_utils.cpp
@@ -49,7 +49,7 @@
 #include <string.h>
 
 #include "video.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 
 void remux_channel(char *out, const char *in, int bps, int in_len, int in_stream_channels, int out_stream_channels, int pos_in_stream, int pos_out_stream)
diff --git a/src/video_capture/bluefish444.cpp b/src/video_capture/bluefish444.cpp
index af78b61b7..c8ec2d471 100644
--- a/src/video_capture/bluefish444.cpp
+++ b/src/video_capture/bluefish444.cpp
@@ -47,7 +47,7 @@
 
 #include "bluefish444_common.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
diff --git a/src/video_capture/decklink.cpp b/src/video_capture/decklink.cpp
index 4d0aab2e0..431fe7e07 100644
--- a/src/video_capture/decklink.cpp
+++ b/src/video_capture/decklink.cpp
@@ -65,7 +65,7 @@
 #include <vector>
 
 #include "blackmagic_common.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
diff --git a/src/video_capture/deltacast.cpp b/src/video_capture/deltacast.cpp
index 0a28d785e..eb192acef 100644
--- a/src/video_capture/deltacast.cpp
+++ b/src/video_capture/deltacast.cpp
@@ -53,7 +53,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "deltacast_common.hpp"
diff --git a/src/video_capture/deltacast_dvi.cpp b/src/video_capture/deltacast_dvi.cpp
index 3a526f33d..b1fa29365 100644
--- a/src/video_capture/deltacast_dvi.cpp
+++ b/src/video_capture/deltacast_dvi.cpp
@@ -58,7 +58,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "deltacast_common.hpp"
diff --git a/src/video_capture/dvs.c b/src/video_capture/dvs.c
index e3733a308..fcc109e55 100644
--- a/src/video_capture/dvs.c
+++ b/src/video_capture/dvs.c
@@ -56,7 +56,7 @@
 
 #ifdef HAVE_DVS           /* From config.h */
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"
@@ -67,7 +67,6 @@
 #include "tv.h"
 #include "dvs_clib.h"           /* From the DVS SDK */
 #include "dvs_fifo.h"           /* From the DVS SDK */
-#include "audio/audio.h"
 
 struct vidcap_dvs_state {
         sv_handle *sv;
diff --git a/src/video_capture/file.c b/src/video_capture/file.c
index 60dbd8e0b..e225df202 100644
--- a/src/video_capture/file.c
+++ b/src/video_capture/file.c
@@ -66,7 +66,7 @@
 #include <stdint.h>
 #include <tv.h>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"
diff --git a/src/video_capture/gpustitch.cpp b/src/video_capture/gpustitch.cpp
index 9351d8c17..9e600cf62 100644
--- a/src/video_capture/gpustitch.cpp
+++ b/src/video_capture/gpustitch.cpp
@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video_capture/import.cpp b/src/video_capture/import.cpp
index 3f7df464b..be0d5d250 100644
--- a/src/video_capture/import.cpp
+++ b/src/video_capture/import.cpp
@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/wav_reader.h"
 #include "keyboard_control.h"
 #include "messaging.h"
@@ -58,7 +58,6 @@
 #include "utils/ring_buffer.h"
 #include "utils/worker.h"
 #include "video_export.h"
-//#include "audio/audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video_capture/ndi.cpp b/src/video_capture/ndi.cpp
index 21aaa4fa0..1037cdb6c 100644
--- a/src/video_capture/ndi.cpp
+++ b/src/video_capture/ndi.cpp
@@ -64,7 +64,7 @@
 #endif // _WIN64
 #endif // _WIN32
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"
diff --git a/src/video_capture/rtsp.cpp b/src/video_capture/rtsp.cpp
index f11f978b7..a2240fa5a 100644
--- a/src/video_capture/rtsp.cpp
+++ b/src/video_capture/rtsp.cpp
@@ -52,6 +52,7 @@
 #include <pthread.h>
 #include <glib.h>
 
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
@@ -69,7 +70,6 @@
 #include "video.h"
 #include "video_codec.h"
 #include "video_capture.h"
-#include "audio/audio.h"
 
 #include <curl/curl.h>
 #include <chrono>
diff --git a/src/video_capture/screen_osx.c b/src/video_capture/screen_osx.c
index 9c2596d1d..5ed511c6b 100644
--- a/src/video_capture/screen_osx.c
+++ b/src/video_capture/screen_osx.c
@@ -50,8 +50,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video_capture/screen_x11.c b/src/video_capture/screen_x11.c
index fde4aefd8..a6bf1e05e 100644
--- a/src/video_capture/screen_x11.c
+++ b/src/video_capture/screen_x11.c
@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video_capture/switcher.c b/src/video_capture/switcher.c
index 958eceeef..5144ef575 100644
--- a/src/video_capture/switcher.c
+++ b/src/video_capture/switcher.c
@@ -46,7 +46,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 
 #include <inttypes.h>
diff --git a/src/video_capture/swmix.cpp b/src/video_capture/swmix.cpp
index ed71925c5..08ed163da 100644
--- a/src/video_capture/swmix.cpp
+++ b/src/video_capture/swmix.cpp
@@ -59,7 +59,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <queue>
 #include <stdio.h>
diff --git a/src/video_capture/testcard.cpp b/src/video_capture/testcard.cpp
index 786842702..16fa0eaa8 100644
--- a/src/video_capture/testcard.cpp
+++ b/src/video_capture/testcard.cpp
@@ -82,7 +82,7 @@
 #endif // defined HAVE_SDL2
 #endif /* HAVE_LIBSDL_MIXER */
 #include <vector>
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "utils/video_pattern_generator.hpp"
 
 #define AUDIO_SAMPLE_RATE 48000
diff --git a/src/video_capture/testcard2.c b/src/video_capture/testcard2.c
index 92eb07bef..81eab7f9f 100644
--- a/src/video_capture/testcard2.c
+++ b/src/video_capture/testcard2.c
@@ -64,7 +64,7 @@
 #include <SDL/SDL_ttf.h>
 #endif
 #endif
-#include "audio/audio.h"
+#include "audio/types.h"
 #include <pthread.h>
 #include <time.h>
 #include <limits.h>
diff --git a/src/video_display/bluefish444.cpp b/src/video_display/bluefish444.cpp
index 8d052037b..255bf0113 100644
--- a/src/video_display/bluefish444.cpp
+++ b/src/video_display/bluefish444.cpp
@@ -53,7 +53,7 @@
 
 #include "bluefish444_common.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
diff --git a/src/video_display/decklink.cpp b/src/video_display/decklink.cpp
index 8e973c35d..54d12db56 100644
--- a/src/video_display/decklink.cpp
+++ b/src/video_display/decklink.cpp
@@ -49,7 +49,7 @@
 
 #define MOD_NAME "[Decklink display] "
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "blackmagic_common.h"
 #include "compat/platform_time.h"
 #include "debug.h"
diff --git a/src/video_display/deltacast.cpp b/src/video_display/deltacast.cpp
index ddb3afc98..801574fb1 100644
--- a/src/video_display/deltacast.cpp
+++ b/src/video_display/deltacast.cpp
@@ -49,7 +49,7 @@
 #include "video.h"
 #include "video_display.h"
 #include "debug.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "utils/ring_buffer.h"
 
diff --git a/src/video_display/dvs.c b/src/video_display/dvs.c
index 9fcff0620..dfaf2b9e9 100644
--- a/src/video_display/dvs.c
+++ b/src/video_display/dvs.c
@@ -56,12 +56,12 @@
 
 #ifdef HAVE_DVS           /* From config.h */
 
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "video.h"
 #include "video_display.h"
 #include "video_display/dvs.h"
-#include "audio/audio.h"
 #include "tv.h"
 #include "utils/ring_buffer.h"
 
diff --git a/src/video_display/sdl.cpp b/src/video_display/sdl.cpp
index 1d5cde5d8..008ada2d6 100644
--- a/src/video_display/sdl.cpp
+++ b/src/video_display/sdl.cpp
@@ -49,7 +49,7 @@
 #include "module.h"
 #include "video_display.h"
 #include "tv.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "utils/ring_buffer.h"
 #include "video.h"