LAB: More header dependency redux

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 {

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 {

engines/lab/image.cpp

@@ -28,6 +28,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "lab/lab.h"
 #include "lab/image.h"
 

engines/lab/image.h

@@ -31,6 +31,10 @@
 #ifndef LAB_IMAGE_H
 #define LAB_IMAGE_H
 
+namespace Common {
+	class File;
+}
+
 namespace Lab {
 
 class Image {

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) {

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 {

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 Music;
-class Utils;
 class LargeSet;
+class Music;
+class Resource;
+class Utils;
 
 enum GameFeatures {
 	GF_LOWRES = 1 << 0,

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 {
 

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 {

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 {
 

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"
 

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 {

engines/lab/resource.cpp

@@ -29,7 +29,9 @@
  */
 
 #include "lab/lab.h"
+
 #include "lab/music.h"
+#include "lab/resource.h"
 
 namespace Lab {
 

engines/lab/savegame.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "graphics/thumbnail.h"
+#include "engines/savestate.h"
 
 #include "lab/lab.h"
 #include "lab/labsets.h"

engines/lab/savegame.h

@@ -31,6 +31,8 @@
 #ifndef LAB_SAVEGAME_H
 #define LAB_SAVEGAME_H
 
+#include "common/savefile.h"
+
 namespace Lab {
 
 class LabEngine;

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"
 

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 {

engines/lab/utils.cpp

@@ -28,6 +28,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "lab/lab.h"
 #include "lab/utils.h"