LAB: Reduced header dependency: dispman.h, eventman.h

17 files changed, 40 insertions, 4 deletions

diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index db8e8c614f..7411dcb794 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -29,6 +29,9 @@
  */
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/music.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index ee9d5bc6a0..f78e55d8d9 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -31,6 +31,9 @@
 #include "graphics/palette.h"
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/music.h"
 #include "lab/image.h"
 #include "lab/resource.h"
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 2759f8a354..af6d4c4ad1 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -30,6 +30,8 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/intro.h"
 #include "lab/labsets.h"
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index edc2588700..176f008bf1 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -29,6 +29,9 @@
  */
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
 
 namespace Lab {
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp
index 2fac5a6d1a..20c893dfd5 100644
--- a/engines/lab/image.cpp
+++ b/engines/lab/image.cpp
@@ -31,6 +31,8 @@
 #include "common/file.h"
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
 #include "lab/image.h"
 
 namespace Lab {
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index 62b0f80b2f..d56f485706 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -29,6 +29,9 @@
  */
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 8e5986fbd9..89e030ce1b 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
 #include "lab/intro.h"
 #include "lab/music.h"
 #include "lab/resource.h"
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 5ce053a6ae..dc77acb4f0 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -36,8 +36,10 @@
 
 #include "lab/lab.h"
 
-#include "lab/music.h"
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
+#include "lab/music.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 7aaa548f0e..4d9cb7bd05 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -38,16 +38,18 @@
 #include "lab/anim.h"
 #include "lab/processroom.h"
 #include "lab/interface.h"
-#include "lab/eventman.h"
-#include "lab/dispman.h"
+//#include "lab/eventman.h"
 
 struct ADGameDescription;
 
 namespace Lab {
 
+class DisplayMan;
+class EventManager;
 class LargeSet;
 class Music;
 class Resource;
+struct TextFont;
 class Utils;
 
 enum GameFeatures {
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index accd56d320..21763918ff 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -30,6 +30,8 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 722ec9959c..66963daf20 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -32,6 +32,7 @@
 
 #include "lab/lab.h"
 
+#include "lab/eventman.h"
 #include "lab/music.h"
 #include "lab/resource.h"
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 4df7e20528..894bdeaa9a 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -32,6 +32,7 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
 #include "lab/resource.h"
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index 65b14782ff..6f5964f940 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -30,6 +30,7 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
 #include "lab/music.h"
 #include "lab/resource.h"
 
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index 13932788d8..1e2c8afc7b 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -32,6 +32,8 @@
 #include "engines/savestate.h"
 
 #include "lab/lab.h"
+
+#include "lab/dispman.h"
 #include "lab/labsets.h"
 #include "lab/savegame.h"
 
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 55825a734a..690dc293a3 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -35,6 +35,8 @@
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp
index bf435be348..c4e5da9f18 100644
--- a/engines/lab/tilepuzzle.cpp
+++ b/engines/lab/tilepuzzle.cpp
@@ -28,10 +28,13 @@
  *
  */
 
+#include "common/file.h"
+
 #include "gui/message.h"
 
 #include "lab/lab.h"
 
+#include "lab/dispman.h"
 #include "lab/image.h"
 #include "lab/labsets.h"
 #include "lab/resource.h"
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index 89ce54f28d..cc0efb2d85 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -29,8 +29,11 @@
  */
 
 #include "lab/lab.h"
-#include "lab/music.h"
+
+#include "lab/dispman.h"
+#include "lab/eventman.h"
 #include "lab/image.h"
+#include "lab/music.h"
 #include "lab/utils.h"
 
 namespace Lab {