From a30f82977349d0cecc83eac2166e1a6be2553fae Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 25 Feb 2006 01:18:01 +0000
Subject: Some more cine header cleanup

svn-id: r20859
---
 engines/cine/bg.cpp         | 1 +
 engines/cine/bg_list.cpp    | 5 ++++-
 engines/cine/bg_list.h      | 3 +++
 engines/cine/cine.cpp       | 2 ++
 engines/cine/cine.h         | 6 ------
 engines/cine/gfx.cpp        | 1 +
 engines/cine/main_loop.cpp  | 1 +
 engines/cine/msg.cpp        | 6 +++++-
 engines/cine/object.cpp     | 8 ++++++++
 engines/cine/pal.cpp        | 1 +
 engines/cine/part.cpp       | 2 ++
 engines/cine/prc.cpp        | 1 +
 engines/cine/rel.cpp        | 1 +
 engines/cine/resource.cpp   | 2 +-
 engines/cine/resource.h     | 3 +++
 engines/cine/script.cpp     | 3 +++
 engines/cine/sfx_player.cpp | 2 ++
 engines/cine/texte.cpp      | 2 ++
 engines/cine/texte.h        | 3 +++
 engines/cine/unpack.cpp     | 2 +-
 engines/cine/unpack.h       | 3 +++
 engines/cine/various.cpp    | 4 +++-
 22 files changed, 51 insertions(+), 11 deletions(-)

(limited to 'engines/cine')

diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp
index 3083f58f9e..3f9fb6e449 100644
--- a/engines/cine/bg.cpp
+++ b/engines/cine/bg.cpp
@@ -24,6 +24,7 @@
 
 #include "cine/cine.h"
 #include "cine/flip_support.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/bg_list.cpp b/engines/cine/bg_list.cpp
index a6669d850b..3b2026e7cf 100644
--- a/engines/cine/bg_list.cpp
+++ b/engines/cine/bg_list.cpp
@@ -22,7 +22,10 @@
  *
  */
 
-#include "cine/cine.h"
+#include "cine/bg_list.h"
+#include "cine/gfx.h"
+#include "cine/object.h"
+#include "cine/part.h"
 
 namespace Cine {
 
diff --git a/engines/cine/bg_list.h b/engines/cine/bg_list.h
index be8f3af75c..662a1b003b 100644
--- a/engines/cine/bg_list.h
+++ b/engines/cine/bg_list.h
@@ -25,6 +25,9 @@
 #ifndef CINE_BGLIST_H_
 #define CINE_BGLIST_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 void addSpriteFilledToBGList(int16 idx);
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 3443544110..9a91820747 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -38,8 +38,10 @@
 
 #include "cine/cine.h"
 #include "cine/main_loop.h"
+#include "cine/object.h"
 #include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
+#include "cine/various.h"
 
 
 namespace Cine {
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index e8c69be48b..b9a8b62e17 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -27,14 +27,10 @@
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
-#include "common/util.h"
 
 #include "base/engine.h"
-#include "base/gameDetector.h"
 
-#include "cine/various.h"
 #include "cine/texte.h"
-#include "cine/object.h"
 #include "cine/rel.h"
 #include "cine/script.h"
 #include "cine/part.h"
@@ -45,8 +41,6 @@
 #include "cine/pal.h"
 #include "cine/gfx.h"
 #include "cine/anim.h"
-#include "cine/unpack.h"
-#include "cine/bg_list.h"
 
 namespace Cine {
 
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index bcd60d4e87..b143df9e70 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/various.h"
 
 #include "common/system.h"
 
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index a44be85aec..60820da585 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -27,6 +27,7 @@
 #include "common/system.h"
 
 #include "cine/main_loop.h"
+#include "cine/object.h"
 #include "cine/various.h"
 
 namespace Cine {
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index 553c9955a9..b412118362 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -22,8 +22,12 @@
  *
  */
 
-#include "cine/cine.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
+#include "cine/msg.h"
 #include "cine/flip_support.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index e880059078..b85e487d82 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -22,8 +22,16 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/util.h"
+
 #include "cine/cine.h"
 #include "cine/flip_support.h"
+#include "cine/object.h"
+#include "cine/part.h"
+#include "cine/resource.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index dec9ab07af..a228541242 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index d379a0dd7a..62f3098525 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -24,6 +24,8 @@
 
 #include "cine/cine.h"
 #include "cine/flip_support.h"
+#include "cine/unpack.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 341fecbf52..db21ca6293 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -25,6 +25,7 @@
 #include "cine/cine.h"
 #include "cine/auto00.h"
 #include "cine/flip_support.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp
index c89f3b9d80..93d4a9f48b 100644
--- a/engines/cine/rel.cpp
+++ b/engines/cine/rel.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/resource.cpp b/engines/cine/resource.cpp
index 6d89fd9ca3..dbed696a29 100644
--- a/engines/cine/resource.cpp
+++ b/engines/cine/resource.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "cine/cine.h"
+#include "cine/resource.h"
 
 namespace Cine {
 
diff --git a/engines/cine/resource.h b/engines/cine/resource.h
index 24217dfd59..84cec3faed 100644
--- a/engines/cine/resource.h
+++ b/engines/cine/resource.h
@@ -25,6 +25,9 @@
 #ifndef CINE_RESOURCE_H_
 #define CINE_RESOURCE_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 void checkDataDisk(int16 param);
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index f055f154c9..e19da540eb 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -23,9 +23,12 @@
  */
 
 #include "cine/cine.h"
+#include "cine/bg_list.h"
 #include "cine/flip_support.h"
+#include "cine/object.h"
 #include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/sfx_player.cpp b/engines/cine/sfx_player.cpp
index edb0fc84e7..0a23c1cb9c 100644
--- a/engines/cine/sfx_player.cpp
+++ b/engines/cine/sfx_player.cpp
@@ -29,6 +29,8 @@
 #include "cine/cine.h"
 #include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
+#include "cine/unpack.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp
index c5d39a8b6c..f0b927a7c7 100644
--- a/engines/cine/texte.cpp
+++ b/engines/cine/texte.cpp
@@ -23,6 +23,8 @@
  */
 
 #include "cine/cine.h"
+#include "common/file.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/texte.h b/engines/cine/texte.h
index 906858410e..263426728e 100644
--- a/engines/cine/texte.h
+++ b/engines/cine/texte.h
@@ -25,6 +25,9 @@
 #ifndef CINE_TEXTE_H_
 #define CINE_TEXTE_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 extern uint8 *textDataPtr;
diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp
index 11f6772129..bd09180289 100644
--- a/engines/cine/unpack.cpp
+++ b/engines/cine/unpack.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "cine/cine.h"
+#include "cine/unpack.h"
 
 namespace Cine {
 
diff --git a/engines/cine/unpack.h b/engines/cine/unpack.h
index 1f0c85bb3b..5677f92248 100644
--- a/engines/cine/unpack.h
+++ b/engines/cine/unpack.h
@@ -25,6 +25,9 @@
 #ifndef CINE_UNPACK_H_
 #define CINE_UNPACK_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 int decomp(uint8 *in, uint8 *out, int size);
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 0937990dc9..efb4be3247 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -24,9 +24,11 @@
 
 #include "cine/cine.h"
 #include "cine/flip_support.h"
-#include "cine/main_loop.h"
 #include "cine/font.h"
+#include "cine/main_loop.h"
+#include "cine/object.h"
 #include "cine/sfx_player.h"
+#include "cine/various.h"
 
 namespace Cine {
 
-- 
cgit v1.2.3