LAB: Removed unnecessary includes

24 files changed, 2 insertions, 81 deletions

diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index 523bfc06bb..5391957d9a 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -28,7 +28,6 @@
  *
  */
 
-#include "common/endian.h"
 #include "lab/lab.h"
 
 namespace Lab {
diff --git a/engines/lab/anim.h b/engines/lab/anim.h
index b5df6e2f65..91bc0d724a 100644
--- a/engines/lab/anim.h
+++ b/engines/lab/anim.h
@@ -31,8 +31,6 @@
 #ifndef LAB_DIFF_H
 #define LAB_DIFF_H
 
-#include "common/file.h"
-
 namespace Lab {
 
 class LabEngine;
@@ -107,5 +105,3 @@ public:
 } // End of namespace Lab
 
 #endif // LAB_DIFF_H
-
-
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index 67890da1ea..18d73ce27c 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -30,15 +30,7 @@
 
 #include "engines/advancedDetector.h"
 
-#include "common/str-array.h"
-#include "common/savefile.h"
-
-#include "base/plugins.h"
-
-#include "graphics/surface.h"
-
 #include "lab/lab.h"
-#include "lab/labfun.h"
 
 static const PlainGameDescriptor lab_setting[] = {
 	{ "lab", "Labyrith of Time" },
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index a7c71f2214..eb26f81e93 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -28,12 +28,8 @@
  *
  */
 
+#include "graphics/palette.h"
 #include "lab/lab.h"
-#include "lab/anim.h"
-#include "lab/image.h"
-#include "lab/labfun.h"
-#include "lab/processroom.h"
-#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h
index bbbbe35126..01d1def134 100644
--- a/engines/lab/dispman.h
+++ b/engines/lab/dispman.h
@@ -31,7 +31,6 @@
 #ifndef LAB_DISPMAN_H
 #define LAB_DISPMAN_H
 
-#include "graphics/palette.h"
 #include "lab/anim.h"
 #include "lab/processroom.h"
 
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index fe334f4e7e..4ef3436492 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -29,13 +29,7 @@
  */
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/anim.h"
-#include "lab/image.h"
 #include "lab/intro.h"
-#include "lab/processroom.h"
-#include "lab/interface.h"
-#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index 53361c9e8a..c68149f056 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/image.h"
-#include "lab/interface.h"
 
 namespace Lab {
 
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp
index 29459b1fcc..f4ad01538f 100644
--- a/engines/lab/image.cpp
+++ b/engines/lab/image.cpp
@@ -29,7 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/image.h"
 
 namespace Lab {
 
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index dae822b8ff..286ff7fe12 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -29,10 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/image.h"
-#include "lab/interface.h"
-#include "common/util.h"
 
 namespace Lab {
 
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index b75a215025..71c5fc83d0 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -30,7 +30,6 @@
 
 #include "lab/lab.h"
 #include "lab/intro.h"
-#include "lab/anim.h"
 
 namespace Lab {
 Intro::Intro(LabEngine *vm) : _vm(vm) {
diff --git a/engines/lab/intro.h b/engines/lab/intro.h
index c532bdfa1e..323859c152 100644
--- a/engines/lab/intro.h
+++ b/engines/lab/intro.h
@@ -31,8 +31,6 @@
 #ifndef LAB_INTRO_H
 #define LAB_INTRO_H
 
-#include "lab/intro.h"
-
 namespace Lab {
 
 class Intro {
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index a5ae97c9b5..4252033ba8 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -28,23 +28,12 @@
  *
  */
 
-#include "common/config-manager.h"
 #include "common/debug-channels.h"
-#include "common/scummsys.h"
-#include "common/error.h"
-#include "common/fs.h"
-#include "common/rect.h"
 
-#include "engines/dialogs.h"
-#include "engines/engine.h"
 #include "engines/util.h"
 #include "gui/message.h"
-#include "engines/advancedDetector.h"
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/resource.h"
-#include "lab/anim.h"
 
 namespace Lab {
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 110e47008c..93f3796eac 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -31,8 +31,6 @@
 #ifndef LAB_H
 #define LAB_H
 
-#include "common/array.h"
-#include "common/events.h"
 #include "common/system.h"
 
 #include "engines/engine.h"
diff --git a/engines/lab/labsets.cpp b/engines/lab/labsets.cpp
index f09f669b7f..2b860ad820 100644
--- a/engines/lab/labsets.cpp
+++ b/engines/lab/labsets.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 8cd0ed93a7..4406fae2d0 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -29,12 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/anim.h"
-#include "lab/image.h"
-#include "lab/processroom.h"
-#include "lab/resource.h"
-#include "lab/interface.h"
 
 namespace Lab {
 
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 4bf15027c5..d1031a006f 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -28,10 +28,8 @@
  *
  */
 
-#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
-#include "lab/labfun.h"
-#include "lab/music.h"
 #include "lab/lab.h"
 
 namespace Lab {
diff --git a/engines/lab/music.h b/engines/lab/music.h
index 6d102e7783..d257d27462 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -31,11 +31,8 @@
 #ifndef LAB_MUSIC_H
 #define LAB_MUSIC_H
 
-#include "common/events.h"
-
 #include "audio/mixer.h"
 #include "audio/audiostream.h"
-#include "audio/decoders/raw.h"
 
 namespace Lab {
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index ed28e87453..e541aa08d7 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -31,11 +31,6 @@
 #include "gui/message.h"
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/processroom.h"
-#include "lab/resource.h"
-#include "lab/anim.h"
-#include "lab/interface.h"
 
 namespace Lab {
 
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index de1e9dc714..b49afa02ab 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -29,7 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/resource.h b/engines/lab/resource.h
index c51e744e03..1c733d8fba 100644
--- a/engines/lab/resource.h
+++ b/engines/lab/resource.h
@@ -31,7 +31,6 @@
 #ifndef LAB_RESOURCE_H
 #define LAB_RESOURCE_H
 
-#include "lab/labfun.h"
 #include "lab/dispman.h"
 
 namespace Lab {
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index 5924d884b9..986e910b91 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -28,13 +28,9 @@
  *
  */
 
-#include "common/savefile.h"
-
-#include "graphics/surface.h"
 #include "graphics/thumbnail.h"
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
 
 namespace Lab {
 #define SAVEGAME_ID       MKTAG('L', 'O', 'T', 'S')
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 5a0348c2ca..ee454bf70c 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -34,12 +34,6 @@
 #include "gui/saveload.h"
 
 #include "lab/lab.h"
-#include "lab/labfun.h"
-#include "lab/image.h"
-#include "lab/processroom.h"
-#include "lab/interface.h"
-#include "lab/anim.h"
-#include "lab/resource.h"
 
 namespace Lab {
 
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index 53749e8dc7..14753fbc72 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -29,7 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/processroom.h"
 
 namespace Lab {
 
diff --git a/engines/lab/utils.cpp b/engines/lab/utils.cpp
index d5d0734268..198e1ab624 100644
--- a/engines/lab/utils.cpp
+++ b/engines/lab/utils.cpp
@@ -29,7 +29,6 @@
  */
 
 #include "lab/lab.h"
-#include "lab/utils.h"
 
 namespace Lab {
 Utils::Utils(LabEngine *vm) : _vm(vm) {