LAB: More header dependency redux

18 files changed, 41 insertions, 8 deletions

diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index b80ef07f9d..ee9d5bc6a0 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -33,6 +33,7 @@
 #include "lab/lab.h"
 #include "lab/music.h"
 #include "lab/image.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 13f3ae64de..2759f8a354 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -29,10 +29,12 @@
  */
 
 #include "lab/lab.h"
+
 #include "lab/image.h"
 #include "lab/intro.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp
index 29459b1fcc..2fac5a6d1a 100644
--- a/engines/lab/image.cpp
+++ b/engines/lab/image.cpp
@@ -28,6 +28,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "lab/lab.h"
 #include "lab/image.h"
 
diff --git a/engines/lab/image.h b/engines/lab/image.h
index 7f2c1ed5c5..0e2f831705 100644
--- a/engines/lab/image.h
+++ b/engines/lab/image.h
@@ -31,6 +31,10 @@
 #ifndef LAB_IMAGE_H
 #define LAB_IMAGE_H
 
+namespace Common {
+	class File;
+}
+
 namespace Lab {
 
 class Image {
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 47dc6713a7..8e5986fbd9 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -29,8 +29,10 @@
  */
 
 #include "lab/lab.h"
+
 #include "lab/intro.h"
 #include "lab/music.h"
+#include "lab/resource.h"
 
 namespace Lab {
 Intro::Intro(LabEngine *vm) : _vm(vm) {
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 04a689848d..5ce053a6ae 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -29,13 +29,16 @@
  */
 
 #include "common/debug-channels.h"
+#include "common/error.h"
 
 #include "engines/util.h"
 #include "gui/message.h"
 
 #include "lab/lab.h"
+
 #include "lab/music.h"
 #include "lab/image.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 7e5f33e236..7aaa548f0e 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -33,9 +33,6 @@
 
 #include "common/system.h"
 #include "common/events.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "engines/savestate.h"
 
 #include "engines/engine.h"
 #include "lab/anim.h"
@@ -43,15 +40,15 @@
 #include "lab/interface.h"
 #include "lab/eventman.h"
 #include "lab/dispman.h"
-#include "lab/resource.h"
 
 struct ADGameDescription;
 
 namespace Lab {
 
+class LargeSet;
 class Music;
+class Resource;
 class Utils;
-class LargeSet;
 
 enum GameFeatures {
 	GF_LOWRES = 1 << 0,
diff --git a/engines/lab/labsets.cpp b/engines/lab/labsets.cpp
index ca37a395cd..b19755e622 100644
--- a/engines/lab/labsets.cpp
+++ b/engines/lab/labsets.cpp
@@ -28,8 +28,12 @@
  *
  */
 
+#include "common/file.h"
+
 #include "lab/lab.h"
+
 #include "lab/labsets.h"
+#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 7bcfd80df7..accd56d320 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -29,9 +29,11 @@
  */
 
 #include "lab/lab.h"
+
+#include "lab/image.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
-#include "lab/image.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index de4ac8ee0c..722ec9959c 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -31,7 +31,9 @@
 #include "audio/decoders/raw.h"
 
 #include "lab/lab.h"
+
 #include "lab/music.h"
+#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/music.h b/engines/lab/music.h
index d257d27462..5efd2e3045 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -31,6 +31,7 @@
 #ifndef LAB_MUSIC_H
 #define LAB_MUSIC_H
 
+#include "common/file.h"
 #include "audio/mixer.h"
 #include "audio/audiostream.h"
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 472c0e477e..4df7e20528 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -31,8 +31,10 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
+
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index d21efaff01..65b14782ff 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -29,7 +29,9 @@
  */
 
 #include "lab/lab.h"
+
 #include "lab/music.h"
+#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index 244f119f59..13932788d8 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "graphics/thumbnail.h"
+#include "engines/savestate.h"
 
 #include "lab/lab.h"
 #include "lab/labsets.h"
diff --git a/engines/lab/savegame.h b/engines/lab/savegame.h
index 82f93e7a6a..608da99d47 100644
--- a/engines/lab/savegame.h
+++ b/engines/lab/savegame.h
@@ -31,6 +31,8 @@
 #ifndef LAB_SAVEGAME_H
 #define LAB_SAVEGAME_H
 
+#include "common/savefile.h"
+
 namespace Lab {
 
 class LabEngine;
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 274e9870d4..55825a734a 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -34,9 +34,11 @@
 #include "gui/saveload.h"
 
 #include "lab/lab.h"
+
+#include "lab/image.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
-#include "lab/image.h"
+#include "lab/resource.h"
 #include "lab/savegame.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp
index f989b1ab2e..bf435be348 100644
--- a/engines/lab/tilepuzzle.cpp
+++ b/engines/lab/tilepuzzle.cpp
@@ -31,8 +31,10 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
-#include "lab/labsets.h"
+
 #include "lab/image.h"
+#include "lab/labsets.h"
+#include "lab/resource.h"
 #include "lab/utils.h"
 
 namespace Lab {
diff --git a/engines/lab/utils.cpp b/engines/lab/utils.cpp
index d5d0734268..b552a40675 100644
--- a/engines/lab/utils.cpp
+++ b/engines/lab/utils.cpp
@@ -28,6 +28,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "lab/lab.h"
 #include "lab/utils.h"