LAB: Reduce header intra-dependency. Reduced image.h dependency

15 files changed, 17 insertions, 11 deletions

diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 75e61b4dfe..42007a4ca1 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -32,6 +32,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h
index 01d1def134..a04d142f8d 100644
--- a/engines/lab/dispman.h
+++ b/engines/lab/dispman.h
@@ -31,12 +31,10 @@
 #ifndef LAB_DISPMAN_H
 #define LAB_DISPMAN_H
 
-#include "lab/anim.h"
-#include "lab/processroom.h"
-
 namespace Lab {
 
 class LabEngine;
+class Image;
 
 struct TextFont {
 	uint32 _dataLength;
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 2b51e34463..f8658a4ec0 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -31,7 +31,7 @@
 #include "lab/lab.h"
 #include "lab/intro.h"
 #include "lab/music.h"
-
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index c68149f056..edc2588700 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp
index f4ad01538f..29459b1fcc 100644
--- a/engines/lab/image.cpp
+++ b/engines/lab/image.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index 286ff7fe12..f536c22dd6 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "lab/lab.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/interface.h b/engines/lab/interface.h
index 50e89e38f7..c4b2341871 100644
--- a/engines/lab/interface.h
+++ b/engines/lab/interface.h
@@ -28,14 +28,13 @@
  *
  */
 
-#include "common/keyboard.h"
-#include "lab/image.h"
-
 #ifndef LAB_INTEFACE_H
 #define LAB_INTEFACE_H
 
 namespace Lab {
 
+class Image;
+
 struct IntuiMessage {
 	uint32 _msgClass;
 	uint16 _code, _qualifier, _mouseX, _mouseY, _gadgetID;
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 9ff8ce5ba3..6b328e1e99 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -35,6 +35,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 52a8df9b10..0290a36298 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -32,12 +32,15 @@
 #define LAB_H
 
 #include "common/system.h"
+#include "common/events.h"
 
 #include "engines/engine.h"
+#include "lab/anim.h"
 #include "lab/labfun.h"
+#include "lab/processroom.h"
 #include "lab/interface.h"
 #include "lab/eventman.h"
-//#include "lab/music.h"
+#include "lab/dispman.h"
 #include "lab/resource.h"
 #include "lab/anim.h"
 #include "lab/labsets.h"
diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h
index 4edb263eee..08f7cda81c 100644
--- a/engines/lab/labfun.h
+++ b/engines/lab/labfun.h
@@ -31,7 +31,6 @@
 #ifndef LAB_LABFUN_H
 #define LAB_LABFUN_H
 
-#include "common/events.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "engines/savestate.h"
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 6d09a99739..8a0bec42e5 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/resource.h b/engines/lab/resource.h
index 1c733d8fba..89303e1a66 100644
--- a/engines/lab/resource.h
+++ b/engines/lab/resource.h
@@ -31,8 +31,6 @@
 #ifndef LAB_RESOURCE_H
 #define LAB_RESOURCE_H
 
-#include "lab/dispman.h"
-
 namespace Lab {
 
 enum StaticText {
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index f9eb0db87c..8b1e426de2 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -35,6 +35,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp
index 68f4771833..7afb7c06ad 100644
--- a/engines/lab/tilepuzzle.cpp
+++ b/engines/lab/tilepuzzle.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "gui/message.h"
+#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index aad9b3dd8e..5b2ef2b1cf 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 #include "lab/music.h"
+#include "lab/image.h"
 
 namespace Lab {