17 files changed, 42 insertions, 9 deletions
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index d36ac0737a..cb8d24fe4c 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -23,6 +23,12 @@
  */
 
 #include "cine/cine.h"
+#include "cine/anim.h"
+#include "cine/flip_support.h"
+#include "cine/gfx.h"
+#include "cine/pal.h"
+#include "cine/part.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp
index 329b9ad0ae..3083f58f9e 100644
--- a/engines/cine/bg.cpp
+++ b/engines/cine/bg.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 377230d24e..3443544110 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -26,6 +26,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "base/gameDetector.h"
 #include "base/plugins.h"
@@ -36,6 +37,8 @@
 #include "sound/mixer.h"
 
 #include "cine/cine.h"
+#include "cine/main_loop.h"
+#include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
 
 
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index fc4b66a073..e8c69be48b 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -28,22 +28,17 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
 
 #include "base/engine.h"
 #include "base/gameDetector.h"
 
 #include "cine/various.h"
-#include "cine/flip_support.h"
 #include "cine/texte.h"
 #include "cine/object.h"
 #include "cine/rel.h"
 #include "cine/script.h"
 #include "cine/part.h"
 #include "cine/prc.h"
-#include "cine/main_loop.h"
 #include "cine/resource.h"
 #include "cine/msg.h"
 #include "cine/bg.h"
@@ -52,11 +47,11 @@
 #include "cine/anim.h"
 #include "cine/unpack.h"
 #include "cine/bg_list.h"
-#include "cine/sfx_player.h"
-#include "cine/sound_driver.h"
 
 namespace Cine {
 
+class AdlibMusic;
+
 enum CineGameId {
 	GID_FW = 1,
 	GID_OS
diff --git a/engines/cine/flip_support.cpp b/engines/cine/flip_support.cpp
index 2dedd34871..9989c0f072 100644
--- a/engines/cine/flip_support.cpp
+++ b/engines/cine/flip_support.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/flip_support.h b/engines/cine/flip_support.h
index 996d44baea..902a0bf35a 100644
--- a/engines/cine/flip_support.h
+++ b/engines/cine/flip_support.h
@@ -25,6 +25,9 @@
 #ifndef CINE_FLIPSUPPORT_H_
 #define CINE_FLIPSUPPORT_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 void flipU16(uint16 *);
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index d7bbc281e0..bcd60d4e87 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -24,6 +24,8 @@
 
 #include "cine/cine.h"
 
+#include "common/system.h"
+
 namespace Cine {
 
 byte *screenBuffer;
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index bb5dbb43a7..a44be85aec 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -22,7 +22,12 @@
  *
  */
 
-#include "cine/cine.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/system.h"
+
+#include "cine/main_loop.h"
+#include "cine/various.h"
 
 namespace Cine {
 
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index 40670e7496..553c9955a9 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index e0d56ce87b..e880059078 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index 7f1e8a2b8e..d379a0dd7a 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index fe0f9021df..341fecbf52 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -24,6 +24,7 @@
 
 #include "cine/cine.h"
 #include "cine/auto00.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index 98c665f67b..f055f154c9 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -23,6 +23,9 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
+#include "cine/sfx_player.h"
+#include "cine/sound_driver.h"
 
 namespace Cine {
 
diff --git a/engines/cine/sfx_player.cpp b/engines/cine/sfx_player.cpp
index 5536d78291..edb0fc84e7 100644
--- a/engines/cine/sfx_player.cpp
+++ b/engines/cine/sfx_player.cpp
@@ -27,6 +27,8 @@
 #include "common/file.h"
 
 #include "cine/cine.h"
+#include "cine/sfx_player.h"
+#include "cine/sound_driver.h"
 
 namespace Cine {
 
diff --git a/engines/cine/sound_driver.cpp b/engines/cine/sound_driver.cpp
index dc1525670c..ffd189aca5 100644
--- a/engines/cine/sound_driver.cpp
+++ b/engines/cine/sound_driver.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
 
 #include "sound/mixer.h"
@@ -30,6 +31,8 @@
 
 namespace Cine {
 
+extern AdlibMusic *g_cine_adlib;
+
 uint8 snd_useAdlib = 0;
 uint16 snd_fadeOutCounter = 0;
 uint16 snd_songTicksCounter = 0;
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 6dc24c396a..0937990dc9 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -23,7 +23,10 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
+#include "cine/main_loop.h"
 #include "cine/font.h"
+#include "cine/sfx_player.h"
 
 namespace Cine {
 
diff --git a/engines/cine/various.h b/engines/cine/various.h
index 4420a61d7e..85e3150733 100644
--- a/engines/cine/various.h
+++ b/engines/cine/various.h
@@ -25,6 +25,9 @@
 #ifndef CINE_VARIOUS_H_
 #define CINE_VARIOUS_H_
 
+#include "common/stdafx.h"
+#include "common/file.h"
+
 #include "cine/cine.h"
 
 namespace Cine {