LAB: Reduced dependency on processroom.h. Yay!

9 files changed, 16 insertions, 5 deletions

diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index b7f69e46e6..46e60dc4e5 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -38,6 +38,7 @@
 #include "lab/intro.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index ff4a2904ac..4bf9aa3155 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -41,6 +41,7 @@
 #include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 2fd60c73e7..2cbea65269 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -35,21 +35,25 @@
 #include "common/rect.h"
 
 #include "engines/engine.h"
-#include "lab/processroom.h"
 
 struct ADGameDescription;
 
 namespace Lab {
 
+struct Action;
 class Anim;
+struct CloseData;
 class DisplayMan;
 class EventManager;
 struct Gadget;
 class Image;
 struct IntuiMessage;
+struct InventoryData;
 class LargeSet;
 class Music;
 class Resource;
+struct RoomData;
+struct Rule;
 struct TextFont;
 class Utils;
 
@@ -75,6 +79,9 @@ struct CrumbData {
 
 #define MAX_CRUMBS          128
 
+typedef CloseData *CloseDataPtr;
+typedef Common::List<Rule *> RuleList;
+
 // Direction defines
 #define NORTH   0
 #define SOUTH   1
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index cec9c4c334..af61c85738 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -36,6 +36,7 @@
 #include "lab/interface.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 7f0197080f..31a4cdd4e4 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -36,6 +36,7 @@
 #include "lab/dispman.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 
diff --git a/engines/lab/processroom.h b/engines/lab/processroom.h
index fae4c2f0a9..cf2f8df019 100644
--- a/engines/lab/processroom.h
+++ b/engines/lab/processroom.h
@@ -101,8 +101,6 @@ typedef struct CloseData {
 	CloseData *_subCloseUps;
 } CloseData;
 
-typedef CloseData *CloseDataPtr;
-
 struct ViewData {
 	int16 *_condition;
 	char *_graphicName;
@@ -128,8 +126,6 @@ struct Rule {
 	Rule *_nextRule;
 };
 
-typedef Common::List<Rule *> RuleList;
-
 struct RoomData {
 	uint16 _northDoor;
 	uint16 _southDoor;
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index 6f5964f940..281f9a22cc 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -32,6 +32,7 @@
 
 #include "lab/dispman.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 
 namespace Lab {
diff --git a/engines/lab/resource.h b/engines/lab/resource.h
index 89303e1a66..2273d79d70 100644
--- a/engines/lab/resource.h
+++ b/engines/lab/resource.h
@@ -33,6 +33,8 @@
 
 namespace Lab {
 
+struct ViewData;
+
 enum StaticText {
 	kTextLowerFloor,
 	kTextMiddleFloor,
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 3578a650b6..8bb57adfed 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -42,6 +42,7 @@
 #include "lab/interface.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/savegame.h"
 #include "lab/utils.h"