GRIM: Clean up unneeded includes and fix some trailing whitespace

engines/grim/bitmap.cpp

@@ -27,6 +27,7 @@
 #include "graphics/colormasks.h"
 #include "graphics/pixelbuffer.h"
 
+#include "engines/grim/savegame.h"
 #include "engines/grim/debug.h"
 #include "engines/grim/grim.h"
 #include "engines/grim/bitmap.h"

engines/grim/bitmap.h

@@ -25,12 +25,18 @@
 
 #include "graphics/pixelformat.h"
 
+#include "common/endian.h"
+
 #include "engines/grim/pool.h"
 
 namespace Graphics {
 class PixelBuffer;
 }
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace Grim {
 
 /**

engines/grim/color.h

@@ -23,7 +23,7 @@
 #ifndef GRIM_COLOR_H
 #define GRIM_COLOR_H
 
-#include "engines/grim/pool.h"
+#include "common/endian.h"
 
 namespace Grim {
 

engines/grim/colormap.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/stream.h"
+
 #include "engines/grim/colormap.h"
 #include "engines/grim/resource.h"
 

engines/grim/colormap.h

@@ -23,6 +23,8 @@
 #ifndef GRIM_COLORMAP_H
 #define GRIM_COLORMAP_H
 
+#include "common/str.h"
+
 #include "engines/grim/object.h"
 
 namespace Common {

engines/grim/costume.cpp

@@ -29,6 +29,7 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/model.h"
+#include "engines/grim/savegame.h"
 #include "engines/grim/emi/modelemi.h"
 #include "engines/grim/costume/chore.h"
 #include "engines/grim/costume/head.h"

engines/grim/costume.h

@@ -23,7 +23,7 @@
 #ifndef GRIM_COSTUME_H
 #define GRIM_COSTUME_H
 
-#include "common/memstream.h"
+#include "common/str.h"
 
 #include "math/matrix4.h"
 

engines/grim/costume/chore.cpp

@@ -21,8 +21,10 @@
  */
 
 #include "engines/grim/costume.h"
+#include "engines/grim/textsplit.h"
 
 #include "engines/grim/costume/chore.h"
+#include "engines/grim/costume/component.h"
 #include "engines/grim/costume/keyframe_component.h"
 
 namespace Grim {

engines/grim/costume/chore.h

@@ -23,7 +23,6 @@
 #ifndef GRIM_CHORE_H
 #define GRIM_CHORE_H
 
-#include "engines/grim/textsplit.h"
 #include "engines/grim/animation.h"
 
 #include "engines/grim/pool.h"
@@ -33,6 +32,7 @@ namespace Grim {
 class Costume;
 class Animation;
 class Component;
+class TextSplitter;
 
 struct TrackKey {
 	int time, value;

engines/grim/costume/head.cpp

@@ -22,6 +22,7 @@
 
 #include "engines/grim/model.h"
 #include "engines/grim/grim.h"
+#include "engines/grim/savegame.h"
 #include "engines/grim/costume/head.h"
 
 namespace Grim {

engines/grim/emi/animationemi.cpp

@@ -24,6 +24,7 @@
 #include "math/vector3d.h"
 #include "math/quat.h"
 #include "engines/grim/emi/animationemi.h"
+#include "common/textconsole.h"
 
 namespace Grim {
 

engines/grim/grim.cpp

@@ -40,6 +40,7 @@
 #include "common/archive.h"
 #include "common/debug-channels.h"
 #include "common/file.h"
+#include "common/foreach.h"
 #include "common/fs.h"
 #include "common/config-manager.h"
 

engines/grim/imuse/imuse_sndmgr.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/endian.h"
+#include "common/stream.h"
 
 #include "engines/grim/resource.h"
 #include "engines/grim/colormap.h"

engines/grim/lab.h

@@ -25,6 +25,10 @@
 
 #include "common/archive.h"
 
+namespace Common {
+	class File;
+}
+
 namespace Grim {
 
 class Lab;

engines/grim/lipsync.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/endian.h"
+#include "common/stream.h"
 
 #include "engines/grim/lipsync.h"
 #include "engines/grim/resource.h"

engines/grim/lipsync.h

@@ -23,6 +23,8 @@
 #ifndef GRIM_LIPSYNC_H
 #define GRIM_LIPSYNC_H
 
+#include "common/str.h"
+
 #include "engines/grim/object.h"
 
 namespace Common {

engines/grim/lua.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/endian.h"
+#include "common/foreach.h"
 #include "common/system.h"
 #include "common/events.h"
 

engines/grim/lua_v1_actor.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/foreach.h"
+
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/actor.h"

engines/grim/lua_v1_text.cpp

@@ -25,6 +25,8 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_stderr
 #define FORBIDDEN_SYMBOL_EXCEPTION_stdin
 
+#include "common/foreach.h"
+
 #include "engines/grim/grim.h"
 #include "engines/grim/lua_v1.h"
 #include "engines/grim/localize.h"

engines/grim/object.h

@@ -23,14 +23,7 @@
 #ifndef GRIM_OBJECT_H
 #define GRIM_OBJECT_H
 
-#include "common/str.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-#include "common/func.h"
 #include "common/list.h"
-#include "common/debug.h"
-#include "common/singleton.h"
-#include "common/textconsole.h"
 
 namespace Grim {
 

engines/grim/objectstate.h

@@ -23,6 +23,8 @@
 #ifndef GRIM_OSTATE_H
 #define GRIM_OSTATE_H
 
+#include "common/endian.h"
+
 #include "engines/grim/pool.h"
 #include "engines/grim/bitmap.h"
 

engines/grim/pool.h

@@ -4,12 +4,11 @@
 
 #include "common/hashmap.h"
 #include "common/list.h"
-#include "common/foreach.h"
-
-#include "engines/grim/savegame.h"
 
 namespace Grim {
 
+class SaveGame;
+
 template<class T> class Pool;
 
 class PoolObjectBase {

engines/grim/primitives.h

@@ -26,7 +26,6 @@
 #include "common/rect.h"
 
 #include "engines/grim/pool.h"
-#include "engines/grim/bitmap.h"
 #include "engines/grim/color.h"
 
 namespace Grim {

engines/grim/resource.cpp

@@ -42,6 +42,8 @@
 #include "engines/grim/update/update.h"
 #include "common/algorithm.h"
 #include "common/zlib.h"
+#include "common/memstream.h"
+#include "common/file.h"
 #include "gui/message.h"
 
 namespace Grim {

engines/grim/resource.h

@@ -24,10 +24,9 @@
 #define GRIM_RESOURCE_H
 
 #include "common/archive.h"
-#include "common/file.h"
+#include "common/array.h"
 
 #include "engines/grim/object.h"
-#include "engines/grim/lua/lua.h"
 
 namespace Grim {
 

engines/grim/textobject.h

@@ -26,6 +26,8 @@
 #include "engines/grim/pool.h"
 #include "engines/grim/color.h"
 
+#include "common/endian.h"
+
 namespace Grim {
 
 class SaveGame;