From 0dcfaf8fb18ee70e807fac71eb846d3248151cb5 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb <joel@teichroeb.net>
Date: Wed, 4 Apr 2012 16:11:05 -0700
Subject: [PATCH] GRIM: Do not include unneeded headers

---
 engines/grim/actor.cpp              | 1 -
 engines/grim/bitmap.cpp             | 1 -
 engines/grim/bitmap.h               | 2 ++
 engines/grim/color.cpp              | 1 -
 engines/grim/costume.cpp            | 1 -
 engines/grim/detection.cpp          | 1 -
 engines/grim/emi/lua_v2.cpp         | 1 -
 engines/grim/font.cpp               | 2 --
 engines/grim/gfx_base.cpp           | 1 -
 engines/grim/gfx_opengl.cpp         | 1 -
 engines/grim/gfx_tinygl.cpp         | 1 -
 engines/grim/imuse/imuse_sndmgr.cpp | 1 -
 engines/grim/keyframe.cpp           | 7 +++----
 engines/grim/localize.cpp           | 1 -
 engines/grim/lua.cpp                | 2 --
 engines/grim/lua/lstate.cpp         | 3 ---
 engines/grim/lua_v1.cpp             | 2 --
 engines/grim/lua_v1_actor.cpp       | 1 -
 engines/grim/lua_v1_graphics.cpp    | 1 -
 engines/grim/lua_v1_sound.cpp       | 2 --
 engines/grim/lua_v1_text.cpp        | 6 ++----
 engines/grim/object.cpp             | 5 -----
 engines/grim/objectstate.cpp        | 2 --
 engines/grim/primitives.cpp         | 2 --
 engines/grim/sector.cpp             | 1 -
 engines/grim/textobject.cpp         | 1 -
 26 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/engines/grim/actor.cpp b/engines/grim/actor.cpp
index 7bf63ead31d..0827306287e 100644
--- a/engines/grim/actor.cpp
+++ b/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"
diff --git a/engines/grim/bitmap.cpp b/engines/grim/bitmap.cpp
index d752407f598..27d04127c73 100644
--- a/engines/grim/bitmap.cpp
+++ b/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"
diff --git a/engines/grim/bitmap.h b/engines/grim/bitmap.h
index 95bac0844ad..79303017a4a 100644
--- a/engines/grim/bitmap.h
+++ b/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"
 
diff --git a/engines/grim/color.cpp b/engines/grim/color.cpp
index 95ec7189e5a..ee8ea062e96 100644
--- a/engines/grim/color.cpp
+++ b/engines/grim/color.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "engines/grim/color.h"
-#include "engines/grim/savegame.h"
 
 namespace Grim {
 
diff --git a/engines/grim/costume.cpp b/engines/grim/costume.cpp
index 1f75e521d52..df96ba8d3db 100644
--- a/engines/grim/costume.cpp
+++ b/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"
diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 144667be07a..1a89208b967 100644
--- a/engines/grim/detection.cpp
+++ b/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"
diff --git a/engines/grim/emi/lua_v2.cpp b/engines/grim/emi/lua_v2.cpp
index 52524300c47..04385d6689b 100644
--- a/engines/grim/emi/lua_v2.cpp
+++ b/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"
 
diff --git a/engines/grim/font.cpp b/engines/grim/font.cpp
index b6216d3666d..8c009845f09 100644
--- a/engines/grim/font.cpp
+++ b/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"
 
diff --git a/engines/grim/gfx_base.cpp b/engines/grim/gfx_base.cpp
index bee66fa5bf4..4eca9c95a12 100644
--- a/engines/grim/gfx_base.cpp
+++ b/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 {
 
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 2be639f7e99..c833c07de01 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/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"
diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
index 315d776156b..f8db2f3409f 100644
--- a/engines/grim/gfx_tinygl.cpp
+++ b/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"
diff --git a/engines/grim/imuse/imuse_sndmgr.cpp b/engines/grim/imuse/imuse_sndmgr.cpp
index f747c7d3e3a..1dfe76e15da 100644
--- a/engines/grim/imuse/imuse_sndmgr.cpp
+++ b/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"
diff --git a/engines/grim/keyframe.cpp b/engines/grim/keyframe.cpp
index 454dad52547..3d9aa3fcccc 100644
--- a/engines/grim/keyframe.cpp
+++ b/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"
 
@@ -272,10 +271,10 @@ bool KeyframeAnim::KeyframeNode::animate(ModelNode &node, float frame, float fad
 	Math::Angle roll = _entries[low]._roll;
 
 	/** @bug Interpolating between two orientations specified by Euler angles (yaw/pitch/roll)
-	 *	by linearly interpolating the YPR values does not compute proper in-between 
+	 *	by linearly interpolating the YPR values does not compute proper in-between
 	 *	poses, i.e. the rotation from start to finish does not go via the shortest arc.
-	 *	Though, if the start and end poses are very similar to each other, this can look 
-	 *	acceptable without visual artifacts. 
+	 *	Though, if the start and end poses are very similar to each other, this can look
+	 *	acceptable without visual artifacts.
 	 */
 	if (useDelta) {
 		pos += dt * _entries[low]._dpos;
diff --git a/engines/grim/localize.cpp b/engines/grim/localize.cpp
index 1e33e726c99..aecbd9fc949 100644
--- a/engines/grim/localize.cpp
+++ b/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 {
diff --git a/engines/grim/lua.cpp b/engines/grim/lua.cpp
index 01d2c758eaf..5300f61445f 100644
--- a/engines/grim/lua.cpp
+++ b/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"
diff --git a/engines/grim/lua/lstate.cpp b/engines/grim/lua/lstate.cpp
index 8c9843094e7..547c4958b3a 100644
--- a/engines/grim/lua/lstate.cpp
+++ b/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"
diff --git a/engines/grim/lua_v1.cpp b/engines/grim/lua_v1.cpp
index 32a694946eb..e204144dd2d 100644
--- a/engines/grim/lua_v1.cpp
+++ b/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"
diff --git a/engines/grim/lua_v1_actor.cpp b/engines/grim/lua_v1_actor.cpp
index d4124cfeb71..c65610d439e 100644
--- a/engines/grim/lua_v1_actor.cpp
+++ b/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"
diff --git a/engines/grim/lua_v1_graphics.cpp b/engines/grim/lua_v1_graphics.cpp
index eb4f9561110..b8b3310c8b7 100644
--- a/engines/grim/lua_v1_graphics.cpp
+++ b/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"
diff --git a/engines/grim/lua_v1_sound.cpp b/engines/grim/lua_v1_sound.cpp
index 709dcd35d90..e228c293d1d 100644
--- a/engines/grim/lua_v1_sound.cpp
+++ b/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"
diff --git a/engines/grim/lua_v1_text.cpp b/engines/grim/lua_v1_text.cpp
index de35a023f68..ee498366b13 100644
--- a/engines/grim/lua_v1_text.cpp
+++ b/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"
 
diff --git a/engines/grim/object.cpp b/engines/grim/object.cpp
index 39709e0558d..97f0931c3f1 100644
--- a/engines/grim/object.cpp
+++ b/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;
diff --git a/engines/grim/objectstate.cpp b/engines/grim/objectstate.cpp
index 126d322b080..12fc72712ab 100644
--- a/engines/grim/objectstate.cpp
+++ b/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"
 
diff --git a/engines/grim/primitives.cpp b/engines/grim/primitives.cpp
index b23a787e899..64df42dfe06 100644
--- a/engines/grim/primitives.cpp
+++ b/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 {
diff --git a/engines/grim/sector.cpp b/engines/grim/sector.cpp
index ce6f1578d2d..87f2ffac7c3 100644
--- a/engines/grim/sector.cpp
+++ b/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 {
diff --git a/engines/grim/textobject.cpp b/engines/grim/textobject.cpp
index 4ece30e3531..b09e0e9a111 100644
--- a/engines/grim/textobject.cpp
+++ b/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"