WINTERMUTE: Clean up a few includes.

7 files changed, 10 insertions, 11 deletions

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 68059072d7..bfc21c6ccc 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -26,10 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/dctypes.h"

-#include "engines/wintermute/persistent.h"

-#include "engines/wintermute/base/base_object.h"

 #include "engines/wintermute/ad/ad_actor.h"

 #include "engines/wintermute/ad/ad_game.h"

 #include "engines/wintermute/ad/ad_scene.h"

@@ -38,16 +34,15 @@
 #include "engines/wintermute/ad/ad_waypoint_group.h"

 #include "engines/wintermute/ad/ad_path.h"

 #include "engines/wintermute/ad/ad_sentence.h"

-#include "engines/wintermute/base/base_object.h"

 #include "engines/wintermute/base/base_parser.h"

 #include "engines/wintermute/base/sound/base_sound.h"

 #include "engines/wintermute/base/base_region.h"

 #include "engines/wintermute/base/base_file_manager.h"

+#include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

-#include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/platform_osystem.h"

+#include "engines/wintermute/base/particles/part_emitter.h"

 #include "engines/wintermute/wintermute.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h
index 3cce827b17..870b3e8418 100644
--- a/engines/wintermute/ad/ad_actor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -33,6 +33,7 @@
 #include "engines/wintermute/dctypes.h"    // Added by ClassView

 #include "engines/wintermute/ad/ad_types.h"    // Added by ClassView

 #include "engines/wintermute/ad/ad_talk_holder.h"

+#include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/base/base_point.h" // Added by ClassView

 #include "engines/wintermute/persistent.h"

 #include "common/str.h"

@@ -41,6 +42,7 @@ namespace WinterMute {
 

 class AdSpriteSet;

 class AdPath;

+class BaseSprite;

 class AdActor : public AdTalkHolder {

 public:

 	TDirection angleToDirection(int angle);

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 91ba066d6a..1ea2512df6 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -51,6 +51,7 @@
 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

 #include "engines/wintermute/video/video_theora_player.h"

+#include "engines/wintermute/base/particles/part_emitter.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index acca57393c..84f13dc989 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/ad/ad_game.h"

 #include "engines/wintermute/ad/ad_item.h"

 #include "engines/wintermute/ad/ad_object.h"

@@ -49,6 +48,7 @@
 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

+#include "engines/wintermute/base/particles/part_emitter.h"

 #include "common/str.h"

 #include "common/util.h"

 

diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h
index a8da8bd820..f26a29c8b2 100644
--- a/engines/wintermute/ad/ad_object.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADOBJECT_H

 

 #include "engines/wintermute/ad/ad_types.h"

-#include "engines/wintermute/base/particles/part_emitter.h"

+#include "engines/wintermute/base/base_object.h"

 

 namespace WinterMute {

 

@@ -40,6 +40,7 @@ class AdSentence;
 class BaseFont;

 class BaseRegion;

 class AdInventory;

+class PartEmitter;

 

 #define MAX_NUM_REGIONS 10

 

diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index 4840951ab2..b2238b63ba 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -32,6 +32,7 @@
 #include "engines/wintermute/base/base_dynamic_buffer.h"

 #include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/base_file_manager.h"

+#include "engines/wintermute/base/base_sprite.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/ad_sprite_set.h b/engines/wintermute/ad/ad_sprite_set.h
index 196d8a8e3a..555ab914cf 100644
--- a/engines/wintermute/ad/ad_sprite_set.h
+++ b/engines/wintermute/ad/ad_sprite_set.h
@@ -31,10 +31,9 @@
 

 

 #include "engines/wintermute/base/base_object.h"

-#include "engines/wintermute/base/base_sprite.h"    // Added by ClassView

 

 namespace WinterMute {

-

+class BaseSprite;

 class AdSpriteSet : public BaseObject {

 public:

 	bool containsSprite(BaseSprite *sprite);