From 7e5ffb2bcf6b187d7d3a4a08231b3b3078b10208 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Tue, 21 Dec 2010 18:16:20 +0000
Subject: MOHAWK: Remove sound.h include from resource.h

svn-id: r54988
---
 engines/mohawk/livingbooks.cpp | 1 +
 engines/mohawk/myst.cpp        | 1 +
 engines/mohawk/resource.cpp    | 1 +
 engines/mohawk/resource.h      | 2 --
 engines/mohawk/riven.cpp       | 1 +
 engines/mohawk/video.cpp       | 1 +
 engines/mohawk/video.h         | 1 +
 7 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/mohawk')

diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index e3a1bdc6e7..ba14c71c9e 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -26,6 +26,7 @@
 #include "mohawk/livingbooks.h"
 #include "mohawk/resource.h"
 #include "mohawk/cursors.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 
 #include "common/events.h"
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index a2b3d57aa7..0a4f127138 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -36,6 +36,7 @@
 #include "mohawk/dialogs.h"
 #include "mohawk/resource.h"
 #include "mohawk/resource_cache.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 
 // The stacks
diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp
index 10792ef7db..de1513b237 100644
--- a/engines/mohawk/resource.cpp
+++ b/engines/mohawk/resource.cpp
@@ -25,6 +25,7 @@
 
 #include "mohawk/resource.h"
 
+#include "common/debug.h"
 #include "common/substream.h"
 #include "common/util.h"
 
diff --git a/engines/mohawk/resource.h b/engines/mohawk/resource.h
index 92bf68192f..1c0f77e7c6 100644
--- a/engines/mohawk/resource.h
+++ b/engines/mohawk/resource.h
@@ -28,8 +28,6 @@
 #include "common/file.h"
 #include "common/str.h"
 
-#include "mohawk/sound.h"
-
 #ifndef MOHAWK_RESOURCE_H
 #define MOHAWK_RESOURCE_H
 
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 9f1ad7d506..939a1ded82 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -36,6 +36,7 @@
 #include "mohawk/riven_external.h"
 #include "mohawk/riven_saveload.h"
 #include "mohawk/dialogs.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/console.h"
 
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index b991205b77..6e076315c1 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "mohawk/mohawk.h"
 #include "mohawk/resource.h"
 #include "mohawk/video.h"
 
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 580bd23c98..d144ac66c2 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -26,6 +26,7 @@
 #ifndef MOHAWK_VIDEO_H
 #define MOHAWK_VIDEO_H
 
+#include "common/array.h"
 #include "graphics/pixelformat.h"
 
 namespace Graphics {
-- 
cgit v1.2.3