GRIM: Do not include unneeded headers

engines/grim/actor.cpp

@@ -33,7 +33,6 @@
 #include "engines/grim/debug.h"
 #include "engines/grim/actor.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/costume.h"
 #include "engines/grim/lipsync.h"
 #include "engines/grim/movie/movie.h"

engines/grim/bitmap.cpp

@@ -29,7 +29,6 @@
 
 #include "engines/grim/savegame.h"
 #include "engines/grim/debug.h"
-#include "engines/grim/grim.h"
 #include "engines/grim/bitmap.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/gfx_base.h"

engines/grim/bitmap.h

@@ -26,6 +26,8 @@
 #include "graphics/pixelformat.h"
 
 #include "common/endian.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
 
 #include "engines/grim/pool.h"
 

engines/grim/color.cpp

@@ -21,7 +21,6 @@
  */
 
 #include "engines/grim/color.h"
-#include "engines/grim/savegame.h"
 
 namespace Grim {
 

engines/grim/costume.cpp

@@ -26,7 +26,6 @@
 #include "engines/grim/colormap.h"
 #include "engines/grim/costume.h"
 #include "engines/grim/textsplit.h"
-#include "engines/grim/grim.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/model.h"
 #include "engines/grim/savegame.h"

engines/grim/detection.cpp

@@ -24,7 +24,6 @@
 #include "engines/obsolete.h"
 
 #include "engines/grim/grim.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/savegame.h"
 
 #include "common/system.h"

engines/grim/emi/lua_v2.cpp

@@ -33,7 +33,6 @@
 
 #include "engines/grim/set.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/lipsync.h"
 
 #include "engines/grim/movie/movie.h"
 

engines/grim/font.cpp

@@ -26,8 +26,6 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/savegame.h"
 #include "engines/grim/font.h"
-#include "engines/grim/lua.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/gfx_base.h"
 

engines/grim/gfx_base.cpp

@@ -22,7 +22,6 @@
 
 #include "engines/grim/gfx_base.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/colormap.h"
 
 namespace Grim {
 

engines/grim/gfx_opengl.cpp

@@ -38,7 +38,6 @@
 #include "engines/grim/material.h"
 #include "engines/grim/gfx_opengl.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/bitmap.h"
 #include "engines/grim/primitives.h"
 #include "engines/grim/model.h"

engines/grim/gfx_tinygl.cpp

@@ -32,7 +32,6 @@
 #include "engines/grim/font.h"
 #include "engines/grim/gfx_tinygl.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/bitmap.h"
 #include "engines/grim/primitives.h"
 #include "engines/grim/model.h"

engines/grim/imuse/imuse_sndmgr.cpp

@@ -24,7 +24,6 @@
 #include "common/stream.h"
 
 #include "engines/grim/resource.h"
-#include "engines/grim/colormap.h"
 
 #include "engines/grim/imuse/imuse_sndmgr.h"
 #include "engines/grim/imuse/imuse_mcmp_mgr.h"

engines/grim/keyframe.cpp

@@ -27,7 +27,6 @@
 #include "engines/grim/debug.h"
 #include "engines/grim/keyframe.h"
 #include "engines/grim/textsplit.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/model.h"
 

engines/grim/localize.cpp

@@ -26,7 +26,6 @@
 
 #include "engines/grim/localize.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 
 namespace Grim {

engines/grim/lua.cpp

@@ -30,11 +30,9 @@
 #include "engines/grim/debug.h"
 #include "engines/grim/lua.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/costume.h"
 #include "engines/grim/registry.h"
 #include "engines/grim/localize.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/grim.h"
 #include "engines/grim/savegame.h"
 #include "engines/grim/resource.h"

engines/grim/lua/lstate.cpp

@@ -15,9 +15,6 @@
 
 #include "engines/grim/debug.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/grim.h"
-#include "engines/grim/lipsync.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/color.h"
 
 #include "engines/grim/lua/lbuiltin.h"

engines/grim/lua_v1.cpp

@@ -33,11 +33,9 @@
 #include "engines/grim/debug.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/costume.h"
 #include "engines/grim/registry.h"
 #include "engines/grim/localize.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/grim.h"
 #include "engines/grim/savegame.h"
 #include "engines/grim/resource.h"

engines/grim/lua_v1_actor.cpp

@@ -25,7 +25,6 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/costume.h"
 #include "engines/grim/set.h"
 #include "engines/grim/model.h"

engines/grim/lua_v1_graphics.cpp

@@ -29,7 +29,6 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/resource.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/bitmap.h"
 #include "engines/grim/primitives.h"
 #include "engines/grim/iris.h"

engines/grim/lua_v1_sound.cpp

@@ -24,9 +24,7 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/set.h"
 
 #include "engines/grim/imuse/imuse.h"

engines/grim/lua_v1_text.cpp

@@ -26,18 +26,16 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_stdin
 
 #include "common/foreach.h"
+#include "common/system.h"
 
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/localize.h"
 #include "engines/grim/actor.h"
-#include "engines/grim/lipsync.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/inputdialog.h"
-
-#include "engines/grim/imuse/imuse.h"
+#include "engines/grim/textobject.h"
 
 #include "engines/grim/lua/lauxlib.h"
 

engines/grim/object.cpp

@@ -20,13 +20,8 @@
  *
  */
 
-#include "engines/grim/lua/lobject.h"
-
-#include "engines/grim/savegame.h"
-#include "engines/grim/font.h"
 #include "engines/grim/object.h"
 
-
 namespace Grim {
 
 int32 Object::s_id = 0;

engines/grim/objectstate.cpp

@@ -22,8 +22,6 @@
 
 #include "engines/grim/objectstate.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/grim.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/bitmap.h"
 

engines/grim/primitives.cpp

@@ -23,9 +23,7 @@
 #include "engines/grim/gfx_base.h"
 #include "engines/grim/primitives.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/grim.h"
-#include "engines/grim/bitmap.h"
 #include "engines/grim/color.h"
 
 namespace Grim {

engines/grim/sector.cpp

@@ -27,7 +27,6 @@
 #include "engines/grim/sector.h"
 #include "engines/grim/textsplit.h"
 #include "engines/grim/savegame.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/set.h"
 
 namespace Grim {

engines/grim/textobject.cpp

@@ -25,7 +25,6 @@
 #include "engines/grim/textobject.h"
 #include "engines/grim/savegame.h"
 #include "engines/grim/lua.h"
-#include "engines/grim/colormap.h"
 #include "engines/grim/font.h"
 #include "engines/grim/gfx_base.h"
 #include "engines/grim/color.h"