WINTERMUTE: Remove dcgf.h from almost all includes.

63 files changed, 1 insertions, 65 deletions

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 1ea2512df6..80c52de71a 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -27,8 +27,6 @@
  */

 

 

-

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

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

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

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

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 977115ad76..ef5461bb5e 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 488cee77c8..38e06535d9 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -25,7 +25,7 @@
  * http://dead-code.org/redir.php?target=wmelite

  * Copyright (c) 2011 Jan Nedoma

  */

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

+

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

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

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

diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index ba116b6569..ec9fa3c14c 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 80fbc683ef..38894a0e88 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index fca2600884..f8196e96b7 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp
index cecfaa37d6..f7832d621d 100644
--- a/engines/wintermute/ad/ad_path.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 965f14d8a3..a23c000137 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp
index 29398f547c..fbfe828330 100644
--- a/engines/wintermute/ad/ad_response.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 #include "engines/wintermute/base/font/base_font_storage.h"

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index a800ae71b2..90582ce811 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.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_response_box.h"

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

diff --git a/engines/wintermute/ad/ad_response_context.cpp b/engines/wintermute/ad/ad_response_context.cpp
index 32d9415fe9..8d966e7a3e 100644
--- a/engines/wintermute/ad/ad_response_context.cpp
+++ b/engines/wintermute/ad/ad_response_context.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index b9949d9f9b..6f3ffdaeb5 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 539e9a8bb7..1adf4266b2 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_scene_node.cpp b/engines/wintermute/ad/ad_scene_node.cpp
index dbf68ff0ca..658e85340d 100644
--- a/engines/wintermute/ad/ad_scene_node.cpp
+++ b/engines/wintermute/ad/ad_scene_node.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp
index 173c1ef57b..617f247241 100644
--- a/engines/wintermute/ad/ad_scene_state.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/persistent.h"

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

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

diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index ad3a291e16..452c2587d4 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index b2238b63ba..e158b6115a 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 2756b69467..cfbefd39d4 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index de19004584..db13e0a549 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index 5325b1aeff..306825c439 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index 4b62a7553a..b81261cdaf 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index 598324e10b..0283ee274e 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index c5f170bb43..8ed2fb3f0b 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 #include "common/util.h"

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 1eb27ad0c4..5d399c33a1 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 2a729a882a..8278c48299 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index ad014762d4..a12f70f3ba 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_named_object.cpp b/engines/wintermute/base/base_named_object.cpp
index ad95d83211..0821c9325b 100644
--- a/engines/wintermute/base/base_named_object.cpp
+++ b/engines/wintermute/base/base_named_object.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 2002f01dc8..44823acf1a 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index b07d98eca8..b7a221daf5 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 #include "engines/wintermute/platform_osystem.h"

diff --git a/engines/wintermute/base/base_point.cpp b/engines/wintermute/base/base_point.cpp
index 76d8d85c70..99e8c609df 100644
--- a/engines/wintermute/base/base_point.cpp
+++ b/engines/wintermute/base/base_point.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/base/base_quick_msg.cpp b/engines/wintermute/base/base_quick_msg.cpp
index 856a214f80..6e435b3ee0 100644
--- a/engines/wintermute/base/base_quick_msg.cpp
+++ b/engines/wintermute/base/base_quick_msg.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index d654f69b9c..22b5a99937 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp
index 9f87f392e5..b63f280f05 100644
--- a/engines/wintermute/base/base_save_thumb_helper.cpp
+++ b/engines/wintermute/base/base_save_thumb_helper.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/base/gfx/base_image.h"

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

diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index c4d8b9b5c2..20eb2d13e1 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.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/base/base_script_holder.h"

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

diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp
index 6da67db3fb..40aa2871b5 100644
--- a/engines/wintermute/base/base_scriptable.cpp
+++ b/engines/wintermute/base/base_scriptable.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 7b3e104d84..86dbefdd70 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index d30d38ef70..2ac011917c 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 7067c2a607..8e6931f54b 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/base/gfx/base_surface.h"

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

diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index e4665756e2..53dd99aac2 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 

diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp
index 5e1ebc5922..be37571901 100644
--- a/engines/wintermute/base/file/BPkgFile.cpp
+++ b/engines/wintermute/base/file/BPkgFile.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/file/base_package.h"

 #include "engines/wintermute/base/file/BPkgFile.h"

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

diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp
index d4109bb259..b2c0b31db9 100644
--- a/engines/wintermute/base/file/base_file.cpp
+++ b/engines/wintermute/base/file/base_file.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/file/base_file.h"

 #include "common/memstream.h"

 

diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index 303d6eea17..a0f56ddf83 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/file/base_package.h"

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

 #include "common/file.h"

diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index a2295b70a5..a6d56f281e 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/base/file/base_save_thumb_file.h"

 #include "engines/wintermute/platform_osystem.h"

diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp
index 0c86517fc7..e9d245782a 100644
--- a/engines/wintermute/base/font/base_font.cpp
+++ b/engines/wintermute/base/font/base_font.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/font/base_font.h"

 #include "engines/wintermute/base/font/base_font_bitmap.h"

 #include "engines/wintermute/base/font/base_font_truetype.h"

diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 9a3caf2669..8fd13a6835 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/font/base_font_bitmap.h"

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

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

diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
index 9adc62c829..338273f338 100644
--- a/engines/wintermute/base/font/base_font_storage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/font/base_font_storage.h"

 #include "engines/wintermute/base/font/base_font.h"

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

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 88eec8469f..18966c662c 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/file/base_file.h"

 #include "engines/wintermute/base/font/base_font_truetype.h"

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

diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 63c23169b7..a40b3204a5 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/base/gfx/base_renderer.h"

 #include "engines/wintermute/base/gfx/base_surface.h"

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 24e3ddb0ae..70d1268e5a 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"

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

 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"

diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 76fe3c79de..bfe050cbe0 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/base/particles/part_particle.h"

 #include "engines/wintermute/math/vector2.h"

diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp
index 7311ea21f6..6a8f328349 100644
--- a/engines/wintermute/base/particles/part_force.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/base/particles/part_force.h"

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

diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index e36cec6f47..37f374a3e5 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/particles/part_particle.h"

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

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

@@ -34,7 +33,6 @@
 #include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

-#include <math.h>

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 11fe6ff0cc..bdd11ca06a 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 472e9d9fec..c275ebf5af 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index e1dba2120d..0b7fc840bf 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/base/file/base_file.h"

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

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

diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index 22b22a5db6..a73b20e404 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 235a73e8a6..93e45fb1ff 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

 #include "engines/wintermute/ui/ui_button.h"

diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index c3548b60ac..3535da0ca5 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

 #include "engines/wintermute/ui/ui_text.h"

 #include "engines/wintermute/ui/ui_tiled_image.h"

diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index 6ee27bb411..5e1d9675c0 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "engines/wintermute/ui/ui_tiled_image.h"

 #include "engines/wintermute/base/gfx/base_surface.h"

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

diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 2c3d7b78ea..e9308e052b 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp
index 6812d824df..d97b9bedab 100644
--- a/engines/wintermute/utils/path_util.cpp
+++ b/engines/wintermute/utils/path_util.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

 #include "common/file.h"

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

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

diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp
index 2806dbe516..be3bb3ec94 100644
--- a/engines/wintermute/video/video_player.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -27,7 +27,6 @@
  */
 
 
-#include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/video/video_player.h"
 
 //#pragma comment(lib, "vfw32.lib")
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index f20d4470ac..81e6769cfd 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -27,7 +27,6 @@
  */
 
 
-#include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/video/video_theora_player.h"
 #include "engines/wintermute/base/base.h"
 #include "engines/wintermute/base/base_game.h"