3 files changed, 6 insertions, 10 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 670c701198..c5841ff05e 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -41,7 +41,6 @@
 
 #include "sound/mididrv.h"
 #include "sound/mods/protracker.h"
-#include "sound/audiocd.h"
 
 using Common::File;
 
@@ -903,7 +902,7 @@ AGOSEngine::~AGOSEngine() {
 	_midi.close();
 	delete _driver;
 
-	AudioCD.stop();
+	_system->getAudioCDManager()->stop();
 
 	for (uint i = 0; i < _itemHeap.size(); i++) {
 		delete[] _itemHeap[i];
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 95c9db906a..32c26752a2 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -36,8 +36,6 @@
 
 #include "graphics/surface.h"
 
-#include "sound/audiocd.h"
-
 namespace AGOS {
 
 void AGOSEngine::addTimeEvent(uint16 timeout, uint16 subroutine_id) {
@@ -429,7 +427,7 @@ void AGOSEngine::delay(uint amount) {
 	uint32 cur = start;
 	uint this_delay, vgaPeriod;
 
-	AudioCD.updateCD();
+	_system->getAudioCDManager()->updateCD();
 
 	_debugger->onFrame();
 
@@ -534,7 +532,7 @@ void AGOSEngine::delay(uint amount) {
 		if (_leftButton == 1)
 			_leftButtonCount++;
 
-		AudioCD.updateCD();
+		_system->getAudioCDManager()->updateCD();
 
 		_system->updateScreen();
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 6e54d926c4..c6417962fb 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -30,7 +30,6 @@
 #include "agos/agos.h"
 #include "agos/vga.h"
 
-#include "sound/audiocd.h"
 #include "sound/audiostream.h"
 #include "sound/mididrv.h"
 #include "sound/mods/protracker.h"
@@ -228,9 +227,9 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
 	stopMusic();
 
 	// Support for compressed music from the ScummVM Music Enhancement Project
-	AudioCD.stop();
-	AudioCD.play(music + 1, -1, 0, 0);
-	if (AudioCD.isPlaying())
+	_system->getAudioCDManager()->stop();
+	_system->getAudioCDManager()->play(music + 1, -1, 0, 0);
+	if (_system->getAudioCDManager()->isPlaying())
 		return;
 
 	if (getPlatform() == Common::kPlatformAmiga) {