TOLTECS: Reduced header dependencies

engines/toltecs/script.cpp

@@ -29,9 +29,6 @@
 #include "common/savefile.h"
 #include "common/config-manager.h"
 
-#include "base/plugins.h"
-#include "base/version.h"
-
 #include "sound/mixer.h"
 
 #include "toltecs/toltecs.h"

engines/toltecs/script.h

@@ -24,20 +24,8 @@
 #ifndef TOLTECS_SCRIPT_H
 #define TOLTECS_SCRIPT_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/array.h"
 #include "common/func.h"
 
-#include "engines/engine.h"
-
 namespace Toltecs {
 
 const int kMaxScriptSlots = 50;

engines/toltecs/segmap.cpp

@@ -21,24 +21,8 @@
  *
  */
 
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-#include "common/stream.h"
-
-#include "graphics/primitives.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "sound/mixer.h"
-
 #include "toltecs/toltecs.h"
 #include "toltecs/render.h"
-#include "toltecs/resource.h"
-#include "toltecs/screen.h"
 #include "toltecs/segmap.h"
 
 namespace Toltecs {

engines/toltecs/segmap.h

@@ -24,21 +24,6 @@
 #ifndef TOLTECS_SEGMAP_H
 #define TOLTECS_SEGMAP_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/array.h"
-
-#include "graphics/surface.h"
-
-#include "engines/engine.h"
-
 #include "toltecs/screen.h"
 
 namespace Toltecs {

engines/toltecs/sound.cpp

@@ -21,26 +21,11 @@
  *
  */
 
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "graphics/cursorman.h"
-
 #include "sound/mixer.h"
 #include "sound/decoders/raw.h"
 
 #include "toltecs/toltecs.h"
-#include "toltecs/palette.h"
-#include "toltecs/render.h"
 #include "toltecs/resource.h"
-#include "toltecs/screen.h"
-#include "toltecs/script.h"
 #include "toltecs/segmap.h"
 #include "toltecs/sound.h"
 

engines/toltecs/sound.h

@@ -24,23 +24,6 @@
 #ifndef TOLTECS_SOUND_H
 #define TOLTECS_SOUND_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/array.h"
-
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
-
-#include "engines/engine.h"
-
 #include "toltecs/toltecs.h"
 
 namespace Toltecs {

engines/toltecs/sprite.cpp

@@ -21,26 +21,10 @@
  *
  */
 
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "graphics/cursorman.h"
-
-#include "sound/mixer.h"
-
 #include "toltecs/toltecs.h"
 #include "toltecs/palette.h"
 #include "toltecs/render.h"
 #include "toltecs/resource.h"
-#include "toltecs/screen.h"
-#include "toltecs/script.h"
-#include "toltecs/segmap.h"
 
 namespace Toltecs {