From 356403233047e260e34887ba0144892be322f472 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 14 Apr 2016 16:10:21 +0300
Subject: JANITORIAL: Reduce audio header dependencies

---
 engines/access/sound.cpp             | 4 +++-
 engines/access/sound.h               | 6 ++++--
 engines/access/video/movie_decoder.h | 7 +------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'engines/access')

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 38f544de4e..448f630501 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -20,9 +20,11 @@
  *
  */
 
-#include "common/algorithm.h"
 #include "common/config-manager.h"
 #include "audio/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/wave.h"
 // Miles Audio
diff --git a/engines/access/sound.h b/engines/access/sound.h
index b372e566d2..d82ee956b1 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -24,14 +24,16 @@
 #define ACCESS_SOUND_H
 
 #include "common/scummsys.h"
-#include "audio/audiostream.h"
 #include "audio/mixer.h"
 #include "access/files.h"
 #include "audio/midiplayer.h"
-#include "audio/midiparser.h"
 
 #define MAX_SOUNDS 20
 
+namespace Audio {
+class AudioStream;
+}
+
 namespace Access {
 
 class AccessEngine;
diff --git a/engines/access/video/movie_decoder.h b/engines/access/video/movie_decoder.h
index fe8a89fcde..8b5d94836b 100644
--- a/engines/access/video/movie_decoder.h
+++ b/engines/access/video/movie_decoder.h
@@ -23,13 +23,8 @@
 #ifndef ACCESS_VIDEO_MOVIE_DECODER_H
 #define ACCESS_VIDEO_MOVIE_DECODER_H
 
-#include "common/rect.h"
 #include "video/video_decoder.h"
-#include "audio/decoders/raw.h"
-
-namespace Audio {
-class QueuingAudioStream;
-}
+#include "audio/audiostream.h"
 
 namespace Common {
 class SeekableReadStream;
-- 
cgit v1.2.3