WINTERMUTE: Rename CamelCased filenames to prefixed_under_score-filenames

This is mostly a lead-up to namespacing the Ad/Base folders, and then
possibly removing the prefixes from the files, it also has the added
benefit of getting rid of the odd case-typos that makes for issues
on platforms that don't ignore case.

53 files changed, 284 insertions, 284 deletions

diff --git a/engines/wintermute/ad/AdActor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 050a419e53..36f1aa8286 100644
--- a/engines/wintermute/ad/AdActor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -29,23 +29,23 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/dctypes.h"

 #include "engines/wintermute/persistent.h"

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

-#include "engines/wintermute/ad/AdActor.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdScene.h"

-#include "engines/wintermute/ad/AdEntity.h"

-#include "engines/wintermute/ad/AdSpriteSet.h"

-#include "engines/wintermute/ad/AdWaypointGroup.h"

-#include "engines/wintermute/ad/AdPath.h"

-#include "engines/wintermute/ad/AdSentence.h"

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

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

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

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

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

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScStack.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"

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

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

+#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/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/wintermute.h"

diff --git a/engines/wintermute/ad/AdActor.h b/engines/wintermute/ad/ad_actor.h
index 1be8b8131d..ca79f638d9 100644
--- a/engines/wintermute/ad/AdActor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -31,9 +31,9 @@
 

 

 #include "engines/wintermute/dctypes.h"    // Added by ClassView

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

-#include "engines/wintermute/ad/AdTalkHolder.h"

-#include "engines/wintermute/base/BPoint.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/base/base_point.h" // Added by ClassView

 #include "engines/wintermute/persistent.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/ad/AdEntity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 49c723f66a..5f32017264 100644
--- a/engines/wintermute/ad/AdEntity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -29,28 +29,28 @@
 

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdEntity.h"

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

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

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

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

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

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdScene.h"

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

-#include "engines/wintermute/ad/AdWaypointGroup.h"

-#include "engines/wintermute/base/font/BFontStorage.h"

-#include "engines/wintermute/base/font/BFont.h"

-#include "engines/wintermute/ad/AdSentence.h"

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

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/ad/ad_waypoint_group.h"

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

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

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

-#include "engines/wintermute/video/VidTheoraPlayer.h"

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdEntity.h b/engines/wintermute/ad/ad_entity.h
index a260ca3329..8b67d27c1f 100644
--- a/engines/wintermute/ad/AdEntity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADENTITY_H

 #define WINTERMUTE_ADENTITY_H

 

-#include "engines/wintermute/ad/AdTalkHolder.h"

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

 

 namespace WinterMute {

 class CVidTheoraPlayer;

diff --git a/engines/wintermute/ad/AdGame.cpp b/engines/wintermute/ad/ad_game.cpp
index 87e3fe14d9..69cda25f29 100644
--- a/engines/wintermute/ad/AdGame.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -27,38 +27,38 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdActor.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdEntity.h"

-#include "engines/wintermute/ad/AdInventory.h"

-#include "engines/wintermute/ad/AdInventoryBox.h"

-#include "engines/wintermute/ad/AdItem.h"

-#include "engines/wintermute/ad/AdResponse.h"

-#include "engines/wintermute/ad/AdResponseBox.h"

-#include "engines/wintermute/ad/AdResponseContext.h"

-#include "engines/wintermute/ad/AdScene.h"

-#include "engines/wintermute/ad/AdSceneState.h"

-#include "engines/wintermute/ad/AdSentence.h"

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

-#include "engines/wintermute/base/font/BFont.h"

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

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

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

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

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

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

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

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

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

-#include "engines/wintermute/base/scriptables/ScEngine.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/ui/UIEntity.h"

-#include "engines/wintermute/ui/UIWindow.h"

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

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

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

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

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

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

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

+#include "engines/wintermute/ad/ad_response_box.h"

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

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

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

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

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

+#include "engines/wintermute/base/font/base_font.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_string_table.h"

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

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

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

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

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

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

+#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/ui/ui_entity.h"

+#include "engines/wintermute/ui/ui_window.h"

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

-#include "engines/wintermute/video/VidPlayer.h"

-#include "engines/wintermute/video/VidTheoraPlayer.h"

+#include "engines/wintermute/video/video_player.h"

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdGame.h b/engines/wintermute/ad/ad_game.h
index 4a89fa97d2..09b3e09df0 100644
--- a/engines/wintermute/ad/AdGame.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -28,8 +28,8 @@
 #ifndef WINTERMUTE_ADGAME_H

 #define WINTERMUTE_ADGAME_H

 

-#include "engines/wintermute/ad/AdTypes.h"

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

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

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

 

 namespace WinterMute {

 class CAdItem;

diff --git a/engines/wintermute/ad/AdInventory.cpp b/engines/wintermute/ad/ad_inventory.cpp
index f913108404..cfbc9e5029 100644
--- a/engines/wintermute/ad/AdInventory.cpp
+++ b/engines/wintermute/ad/ad_inventory.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/ad/AdInventory.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdItem.h"

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

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/ad/AdInventory.h b/engines/wintermute/ad/ad_inventory.h
index cec76c03a0..84d9308d5d 100644
--- a/engines/wintermute/ad/AdInventory.h
+++ b/engines/wintermute/ad/ad_inventory.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORY_H

 #define WINTERMUTE_ADINVENTORY_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdInventoryBox.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 9509bf9b10..abe8676376 100644
--- a/engines/wintermute/ad/AdInventoryBox.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdInventoryBox.h"

-#include "engines/wintermute/ad/AdInventory.h"

-#include "engines/wintermute/ad/AdItem.h"

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

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

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

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

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

-#include "engines/wintermute/ui/UIButton.h"

-#include "engines/wintermute/ui/UIWindow.h"

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/ui/ui_window.h"

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 #include "common/rect.h"

diff --git a/engines/wintermute/ad/AdInventoryBox.h b/engines/wintermute/ad/ad_inventory_box.h
index cfd8d74021..09d3ef409e 100644
--- a/engines/wintermute/ad/AdInventoryBox.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORYBOX_H

 #define WINTERMUTE_ADINVENTORYBOX_H

 

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

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

 #include "common/rect.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdItem.cpp b/engines/wintermute/ad/ad_item.cpp
index 0e443d5c3e..9c49a86bcb 100644
--- a/engines/wintermute/ad/AdItem.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -27,21 +27,21 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdItem.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdSentence.h"

-#include "engines/wintermute/base/font/BFontStorage.h"

-#include "engines/wintermute/base/font/BFont.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

-#include "engines/wintermute/base/scriptables/ScValue.h"

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdItem.h b/engines/wintermute/ad/ad_item.h
index d45f9cc614..34b19a830f 100644
--- a/engines/wintermute/ad/AdItem.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADITEM_H

 

 

-#include "engines/wintermute/ad/AdTalkHolder.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdLayer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 4549ba4af7..e23948ed87 100644
--- a/engines/wintermute/ad/AdLayer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -27,15 +27,15 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

-#include "engines/wintermute/ad/AdLayer.h"

-#include "engines/wintermute/ad/AdSceneNode.h"

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

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

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/ad/AdLayer.h b/engines/wintermute/ad/ad_layer.h
index 0ccdb13ae7..0ccdb13ae7 100644
--- a/engines/wintermute/ad/AdLayer.h
+++ b/engines/wintermute/ad/ad_layer.h
diff --git a/engines/wintermute/ad/AdNodeState.cpp b/engines/wintermute/ad/ad_node_state.cpp
index fd72a356c5..06f9c4cf95 100644
--- a/engines/wintermute/ad/AdNodeState.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

-#include "engines/wintermute/ad/AdNodeState.h"

-#include "engines/wintermute/ad/AdEntity.h"

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

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

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

diff --git a/engines/wintermute/ad/AdNodeState.h b/engines/wintermute/ad/ad_node_state.h
index 186f2ebbb2..186f2ebbb2 100644
--- a/engines/wintermute/ad/AdNodeState.h
+++ b/engines/wintermute/ad/ad_node_state.h
diff --git a/engines/wintermute/ad/AdObject.cpp b/engines/wintermute/ad/ad_object.cpp
index c74c8cf6b3..46f2e590fd 100644
--- a/engines/wintermute/ad/AdObject.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -27,28 +27,28 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdItem.h"

-#include "engines/wintermute/ad/AdObject.h"

-#include "engines/wintermute/ad/AdInventory.h"

-#include "engines/wintermute/ad/AdLayer.h"

-#include "engines/wintermute/ad/AdScene.h"

-#include "engines/wintermute/ad/AdSceneNode.h"

-#include "engines/wintermute/ad/AdSentence.h"

-#include "engines/wintermute/ad/AdWaypointGroup.h"

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

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

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

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

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

-#include "engines/wintermute/base/font/BFont.h"

-#include "engines/wintermute/base/font/BFontStorage.h"

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

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

-#include "engines/wintermute/base/scriptables/ScEngine.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

-#include "engines/wintermute/base/scriptables/ScValue.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/ad/ad_waypoint_group.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "common/str.h"

 #include "common/util.h"

 

diff --git a/engines/wintermute/ad/AdObject.h b/engines/wintermute/ad/ad_object.h
index d662e84729..dd123092a3 100644
--- a/engines/wintermute/ad/AdObject.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADOBJECT_H

 #define WINTERMUTE_ADOBJECT_H

 

-#include "engines/wintermute/ad/AdTypes.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdPath.cpp b/engines/wintermute/ad/ad_path.cpp
index d1b9d87063..780912ce08 100644
--- a/engines/wintermute/ad/AdPath.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -27,8 +27,8 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdPath.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdPath.h b/engines/wintermute/ad/ad_path.h
index fdc2980042..f27362bfd9 100644
--- a/engines/wintermute/ad/AdPath.h
+++ b/engines/wintermute/ad/ad_path.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/coll_templ.h"

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

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

 

 namespace WinterMute {

 class CBPoint;

diff --git a/engines/wintermute/ad/AdPathPoint.cpp b/engines/wintermute/ad/ad_path_point.cpp
index 184ad8559a..d4b910a30f 100644
--- a/engines/wintermute/ad/AdPathPoint.cpp
+++ b/engines/wintermute/ad/ad_path_point.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/ad/AdPathPoint.h"

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

+#include "engines/wintermute/ad/ad_path_point.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdPathPoint.h b/engines/wintermute/ad/ad_path_point.h
index f58df765b1..2a58237bb9 100644
--- a/engines/wintermute/ad/AdPathPoint.h
+++ b/engines/wintermute/ad/ad_path_point.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADPATHPOINT_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdRegion.cpp b/engines/wintermute/ad/ad_region.cpp
index a1864de1ac..ae65be5013 100644
--- a/engines/wintermute/ad/AdRegion.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -27,13 +27,13 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdRegion.h"

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

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

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdRegion.h b/engines/wintermute/ad/ad_region.h
index c91feb4012..62c5fd6ba3 100644
--- a/engines/wintermute/ad/AdRegion.h
+++ b/engines/wintermute/ad/ad_region.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADREGION_H

 #define WINTERMUTE_ADREGION_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdResponse.cpp b/engines/wintermute/ad/ad_response.cpp
index 20617f9573..b653fbd36a 100644
--- a/engines/wintermute/ad/AdResponse.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -27,10 +27,10 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdResponse.h"

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

-#include "engines/wintermute/base/font/BFontStorage.h"

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

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

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

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

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdResponse.h b/engines/wintermute/ad/ad_response.h
index 646d781b89..da450b2229 100644
--- a/engines/wintermute/ad/AdResponse.h
+++ b/engines/wintermute/ad/ad_response.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADRESPONSE_H

 

 

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

-#include "engines/wintermute/ad/AdTypes.h"

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

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

 

 namespace WinterMute {

 class CBFont;

diff --git a/engines/wintermute/ad/AdResponseBox.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 829d58f2ee..2499c9a732 100644
--- a/engines/wintermute/ad/AdResponseBox.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -27,20 +27,20 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdResponseBox.h"

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

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

-#include "engines/wintermute/ui/UIButton.h"

-#include "engines/wintermute/ui/UIWindow.h"

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

-#include "engines/wintermute/base/font/BFontStorage.h"

-#include "engines/wintermute/base/font/BFont.h"

-#include "engines/wintermute/ad/AdResponse.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

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

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

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

+#include "engines/wintermute/ad/ad_response_box.h"

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

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

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

+#include "engines/wintermute/ui/ui_window.h"

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

diff --git a/engines/wintermute/ad/AdResponseBox.h b/engines/wintermute/ad/ad_response_box.h
index 93b677bd4a..7c611ef2d6 100644
--- a/engines/wintermute/ad/AdResponseBox.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSEBOX_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdResponseContext.cpp b/engines/wintermute/ad/ad_response_context.cpp
index 8573e58b95..02b819d6de 100644
--- a/engines/wintermute/ad/AdResponseContext.cpp
+++ b/engines/wintermute/ad/ad_response_context.cpp
@@ -27,8 +27,8 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdResponseContext.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdResponseContext.h b/engines/wintermute/ad/ad_response_context.h
index 74506405de..79eaa27640 100644
--- a/engines/wintermute/ad/AdResponseContext.h
+++ b/engines/wintermute/ad/ad_response_context.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSECONTEXT_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdRotLevel.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 671d003f35..0ffbaf6919 100644
--- a/engines/wintermute/ad/AdRotLevel.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -27,12 +27,12 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdRotLevel.h"

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

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

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdRotLevel.h b/engines/wintermute/ad/ad_rot_level.h
index 9e536a8d8f..2bd9519d65 100644
--- a/engines/wintermute/ad/AdRotLevel.h
+++ b/engines/wintermute/ad/ad_rot_level.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADROTLEVEL_H

 #define WINTERMUTE_ADROTLEVEL_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdScaleLevel.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 1ac2f7ba6c..220d3c4b39 100644
--- a/engines/wintermute/ad/AdScaleLevel.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdScaleLevel.h"

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdScaleLevel.h b/engines/wintermute/ad/ad_scale_level.h
index c360ec4eff..4a81c00dda 100644
--- a/engines/wintermute/ad/AdScaleLevel.h
+++ b/engines/wintermute/ad/ad_scale_level.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCALELEVEL_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdScene.cpp b/engines/wintermute/ad/ad_scene.cpp
index b284543a08..11030d6996 100644
--- a/engines/wintermute/ad/AdScene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -26,37 +26,37 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/ad/AdScene.h"

-#include "engines/wintermute/ad/AdActor.h"

-#include "engines/wintermute/ad/AdEntity.h"

-#include "engines/wintermute/ad/AdGame.h"

-#include "engines/wintermute/ad/AdLayer.h"

-#include "engines/wintermute/ad/AdNodeState.h"

-#include "engines/wintermute/ad/AdObject.h"

-#include "engines/wintermute/ad/AdPath.h"

-#include "engines/wintermute/ad/AdPathPoint.h"

-#include "engines/wintermute/ad/AdRotLevel.h"

-#include "engines/wintermute/ad/AdScaleLevel.h"

-#include "engines/wintermute/ad/AdSceneNode.h"

-#include "engines/wintermute/ad/AdSceneState.h"

-#include "engines/wintermute/ad/AdSentence.h"

-#include "engines/wintermute/ad/AdWaypointGroup.h"

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

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

-#include "engines/wintermute/base/font/BFont.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/ad/ad_path_point.h"

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

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

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

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

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

+#include "engines/wintermute/ad/ad_waypoint_group.h"

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

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/ui/UIWindow.h"

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

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

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

+#include "engines/wintermute/ui/ui_window.h"

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

 #include <limits.h>

 

diff --git a/engines/wintermute/ad/AdScene.h b/engines/wintermute/ad/ad_scene.h
index f77c64aa9b..ab62a4a7fc 100644
--- a/engines/wintermute/ad/AdScene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADSCENE_H

 #define WINTERMUTE_ADSCENE_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdSceneNode.cpp b/engines/wintermute/ad/ad_scene_node.cpp
index 5f518e5442..da7082105f 100644
--- a/engines/wintermute/ad/AdSceneNode.cpp
+++ b/engines/wintermute/ad/ad_scene_node.cpp
@@ -27,8 +27,8 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdSceneNode.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdSceneNode.h b/engines/wintermute/ad/ad_scene_node.h
index d081959934..1c25f91a2d 100644
--- a/engines/wintermute/ad/AdSceneNode.h
+++ b/engines/wintermute/ad/ad_scene_node.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSCENENODE_H

 

 

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

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

-#include "engines/wintermute/ad/AdEntity.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdSceneState.cpp b/engines/wintermute/ad/ad_scene_state.cpp
index 5dfb8c537e..2ac36054a5 100644
--- a/engines/wintermute/ad/AdSceneState.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -28,8 +28,8 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/persistent.h"

-#include "engines/wintermute/ad/AdSceneState.h"

-#include "engines/wintermute/ad/AdNodeState.h"

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/ad/AdSceneState.h b/engines/wintermute/ad/ad_scene_state.h
index 82207f383c..6df20e0578 100644
--- a/engines/wintermute/ad/AdSceneState.h
+++ b/engines/wintermute/ad/ad_scene_state.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCENESTATE_H

 

 #include "engines/wintermute/persistent.h"

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

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

 #include "engines/wintermute/coll_templ.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdSentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 98926caac6..2607993aa0 100644
--- a/engines/wintermute/ad/AdSentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -27,17 +27,17 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdSentence.h"

-#include "engines/wintermute/ad/AdTalkDef.h"

-#include "engines/wintermute/ad/AdTalkNode.h"

-#include "engines/wintermute/ad/AdGame.h"

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

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

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

-#include "engines/wintermute/ad/AdScene.h"

-#include "engines/wintermute/base/font/BFont.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdSentence.h b/engines/wintermute/ad/ad_sentence.h
index 954568878e..40f99ea830 100644
--- a/engines/wintermute/ad/AdSentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSENTENCE_H

 

 

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

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

 #include "engines/wintermute/persistent.h"

-#include "engines/wintermute/math/Rect32.h"

+#include "engines/wintermute/math/rect32.h"

 #include "engines/wintermute/dctypes.h"    // Added by ClassView

 #include "common/rect.h"

 

diff --git a/engines/wintermute/ad/AdSpriteSet.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index 127d42d02b..f0925c6913 100644
--- a/engines/wintermute/ad/AdSpriteSet.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdSpriteSet.h"

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdSpriteSet.h b/engines/wintermute/ad/ad_sprite_set.h
index ba5c6fb75b..993832cfa3 100644
--- a/engines/wintermute/ad/AdSpriteSet.h
+++ b/engines/wintermute/ad/ad_sprite_set.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADSPRITESET_H

 

 

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdTalkDef.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index b598226413..0cd62df603 100644
--- a/engines/wintermute/ad/AdTalkDef.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -27,14 +27,14 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdTalkDef.h"

-#include "engines/wintermute/ad/AdTalkNode.h"

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

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

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

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

-#include "engines/wintermute/ad/AdSpriteSet.h"

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

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

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdTalkDef.h b/engines/wintermute/ad/ad_talk_def.h
index 81d6475013..0811f5b8f5 100644
--- a/engines/wintermute/ad/AdTalkDef.h
+++ b/engines/wintermute/ad/ad_talk_def.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKDEF_H

 

 #include "engines/wintermute/coll_templ.h"

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

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

 

 namespace WinterMute {

 class CAdTalkNode;

diff --git a/engines/wintermute/ad/AdTalkHolder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index e1a91792ce..28e62798c2 100644
--- a/engines/wintermute/ad/AdTalkHolder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -27,13 +27,13 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdTalkHolder.h"

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

-#include "engines/wintermute/base/scriptables/ScValue.h"

-#include "engines/wintermute/base/scriptables/ScScript.h"

-#include "engines/wintermute/base/scriptables/ScStack.h"

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

-#include "engines/wintermute/base/BSprite.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"

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

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

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

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

 #include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "common/str.h"

diff --git a/engines/wintermute/ad/AdTalkHolder.h b/engines/wintermute/ad/ad_talk_holder.h
index 9e6c3bbd63..50c2f3504b 100644
--- a/engines/wintermute/ad/AdTalkHolder.h
+++ b/engines/wintermute/ad/ad_talk_holder.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADTALKHOLDER_H

 #define WINTERMUTE_ADTALKHOLDER_H

 

-#include "engines/wintermute/ad/AdObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdTalkNode.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index da2195be33..3b82d731c9 100644
--- a/engines/wintermute/ad/AdTalkNode.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -27,12 +27,12 @@
  */

 

 #include "engines/wintermute/dcgf.h"

-#include "engines/wintermute/ad/AdTalkNode.h"

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

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

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

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

-#include "engines/wintermute/ad/AdSpriteSet.h"

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

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

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

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

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

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

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

 namespace WinterMute {

 

diff --git a/engines/wintermute/ad/AdTalkNode.h b/engines/wintermute/ad/ad_talk_node.h
index 11bbb353c1..55adf88e83 100644
--- a/engines/wintermute/ad/AdTalkNode.h
+++ b/engines/wintermute/ad/ad_talk_node.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKNODE_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 class CAdSpriteSet;

diff --git a/engines/wintermute/ad/AdTypes.h b/engines/wintermute/ad/ad_types.h
index b88d6fe259..b88d6fe259 100644
--- a/engines/wintermute/ad/AdTypes.h
+++ b/engines/wintermute/ad/ad_types.h
diff --git a/engines/wintermute/ad/AdWaypointGroup.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 3080b34c09..4a902266ac 100644
--- a/engines/wintermute/ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/ad/AdWaypointGroup.h"

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

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

-#include "engines/wintermute/base/scriptables/ScValue.h"

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

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

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

+#include "engines/wintermute/ad/ad_waypoint_group.h"

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

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

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

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

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

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

 #include <limits.h>

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdWaypointGroup.h b/engines/wintermute/ad/ad_waypoint_group.h
index f7c9e4c361..2cece9e88b 100644
--- a/engines/wintermute/ad/AdWaypointGroup.h
+++ b/engines/wintermute/ad/ad_waypoint_group.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADWAYPOINTGROUP_H

 #define WINTERMUTE_ADWAYPOINTGROUP_H

 

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

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

 

 namespace WinterMute {

 class CBPoint;