LAB: Reduced header dependency: labsets.h, utils.h

14 files changed, 23 insertions, 5 deletions

diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index d4abc34c27..db8e8c614f 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 42007a4ca1..b80ef07f9d 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/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index f8658a4ec0..13f3ae64de 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -29,9 +29,11 @@
  */
 
 #include "lab/lab.h"
+#include "lab/image.h"
 #include "lab/intro.h"
+#include "lab/labsets.h"
 #include "lab/music.h"
-#include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index f536c22dd6..62b0f80b2f 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 6b328e1e99..04a689848d 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -36,6 +36,7 @@
 #include "lab/lab.h"
 #include "lab/music.h"
 #include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 4242780ff7..7e5f33e236 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -44,15 +44,14 @@
 #include "lab/eventman.h"
 #include "lab/dispman.h"
 #include "lab/resource.h"
-#include "lab/anim.h"
-#include "lab/labsets.h"
-#include "lab/utils.h"
 
 struct ADGameDescription;
 
 namespace Lab {
 
 class Music;
+class Utils;
+class LargeSet;
 
 enum GameFeatures {
 	GF_LOWRES = 1 << 0,
diff --git a/engines/lab/labsets.cpp b/engines/lab/labsets.cpp
index 2b860ad820..ca37a395cd 100644
--- a/engines/lab/labsets.cpp
+++ b/engines/lab/labsets.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/labsets.h"
 
 namespace Lab {
 
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 8a0bec42e5..7bcfd80df7 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -29,8 +29,10 @@
  */
 
 #include "lab/lab.h"
+#include "lab/labsets.h"
 #include "lab/music.h"
 #include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 8876740e1b..472c0e477e 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -31,7 +31,9 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
+#include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index c9cb831513..244f119f59 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -31,6 +31,7 @@
 #include "graphics/thumbnail.h"
 
 #include "lab/lab.h"
+#include "lab/labsets.h"
 #include "lab/savegame.h"
 
 namespace Lab {
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 11af40a609..274e9870d4 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/labsets.h"
 #include "lab/music.h"
 #include "lab/image.h"
 #include "lab/savegame.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp
index 7afb7c06ad..f989b1ab2e 100644
--- a/engines/lab/tilepuzzle.cpp
+++ b/engines/lab/tilepuzzle.cpp
@@ -28,9 +28,12 @@
  *
  */
 
-#include "lab/lab.h"
 #include "gui/message.h"
+
+#include "lab/lab.h"
+#include "lab/labsets.h"
 #include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index 5b2ef2b1cf..89ce54f28d 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -31,6 +31,7 @@
 #include "lab/lab.h"
 #include "lab/music.h"
 #include "lab/image.h"
+#include "lab/utils.h"
 
 namespace Lab {
 
diff --git a/engines/lab/utils.cpp b/engines/lab/utils.cpp
index 198e1ab624..d5d0734268 100644
--- a/engines/lab/utils.cpp
+++ b/engines/lab/utils.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/utils.h"
 
 namespace Lab {
 Utils::Utils(LabEngine *vm) : _vm(vm) {