WINTERMUTE: Move all the Ad files to Ad/

59 files changed, 281 insertions, 283 deletions

diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 3778fbaa5f..9b30d16221 100644
--- a/engines/wintermute/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -30,14 +30,14 @@
 #include "engines/wintermute/dctypes.h"

 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/BObject.h"

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

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

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

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

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

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

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

-#include "engines/wintermute/AdSentence.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/BObject.h"

 #include "engines/wintermute/BParser.h"

 #include "engines/wintermute/BSound.h"

diff --git a/engines/wintermute/AdActor.h b/engines/wintermute/Ad/AdActor.h
index 2f3a678f93..cbe5e2161e 100644
--- a/engines/wintermute/AdActor.h
+++ b/engines/wintermute/Ad/AdActor.h
@@ -30,11 +30,11 @@
 #define WINTERMUTE_ADACTOR_H

 

 

-#include "dctypes.h"    // Added by ClassView

-#include "AdTypes.h"    // Added by ClassView

-#include "AdTalkHolder.h"

-#include "BPoint.h" // Added by ClassView

-#include "persistent.h"

+#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/BPoint.h" // Added by ClassView

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

 #include "common/str.h"

 

 #if _MSC_VER > 1000

diff --git a/engines/wintermute/AdActorDir.cpp b/engines/wintermute/Ad/AdActorDir.cpp
index 6966c5fc1b..d44cb3dc6d 100644
--- a/engines/wintermute/AdActorDir.cpp
+++ b/engines/wintermute/Ad/AdActorDir.cpp
@@ -25,7 +25,7 @@
  * http://dead-code.org/redir.php?target=wmelite

  * Copyright (c) 2011 Jan Nedoma

  */

-#include "AdActorDir.h"

+#include "engines/wintermute/Ad/AdActorDir.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdActorDir.h b/engines/wintermute/Ad/AdActorDir.h
index 5df19f2aeb..6408c51ad9 100644
--- a/engines/wintermute/AdActorDir.h
+++ b/engines/wintermute/Ad/AdActorDir.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADACTORDIR_H

 #define WINTERMUTE_ADACTORDIR_H

 

-#include "persistent.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index b00b0bd923..1e492bbdca 100644
--- a/engines/wintermute/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -29,19 +29,19 @@
 

 

 #include "engines/wintermute/dcgf.h"

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

+#include "engines/wintermute/Ad/AdEntity.h"

 #include "engines/wintermute/BParser.h"

 #include "engines/wintermute/BDynBuffer.h"

 #include "engines/wintermute/BActiveRect.h"

 #include "engines/wintermute/BSurfaceStorage.h"

 #include "engines/wintermute/BGame.h"

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

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

+#include "engines/wintermute/Ad/AdGame.h"

+#include "engines/wintermute/Ad/AdScene.h"

 #include "engines/wintermute/BSound.h"

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

+#include "engines/wintermute/Ad/AdWaypointGroup.h"

 #include "engines/wintermute/BFontStorage.h"

 #include "engines/wintermute/BFont.h"

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

+#include "engines/wintermute/Ad/AdSentence.h"

 #include "engines/wintermute/BRegion.h"

 #include "engines/wintermute/BSprite.h"

 #include "engines/wintermute/BFileManager.h"

diff --git a/engines/wintermute/AdEntity.h b/engines/wintermute/Ad/AdEntity.h
index 30b9bab3a7..071ad5ee5d 100644
--- a/engines/wintermute/AdEntity.h
+++ b/engines/wintermute/Ad/AdEntity.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADENTITY_H

 #define WINTERMUTE_ADENTITY_H

 

-#include "AdTalkHolder.h"

+#include "engines/wintermute/Ad/AdTalkHolder.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index e2d790e87e..4de2e70dae 100644
--- a/engines/wintermute/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -27,10 +27,10 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

+#include "engines/wintermute/Ad/AdGame.h"

+#include "engines/wintermute/Ad/AdResponseBox.h"

+#include "engines/wintermute/Ad/AdInventoryBox.h"

+#include "engines/wintermute/Ad/AdSceneState.h"

 #include "engines/wintermute/PartEmitter.h"

 #include "engines/wintermute/BParser.h"

 #include "engines/wintermute/BSurfaceStorage.h"

@@ -40,18 +40,18 @@
 #include "engines/wintermute/UIWindow.h"

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

 #include "engines/wintermute/UIEntity.h"

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

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

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

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

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

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

+#include "engines/wintermute/Ad/AdScene.h"

+#include "engines/wintermute/Ad/AdEntity.h"

+#include "engines/wintermute/Ad/AdActor.h"

+#include "engines/wintermute/Ad/AdInventory.h"

+#include "engines/wintermute/Ad/AdResponseContext.h"

+#include "engines/wintermute/Ad/AdItem.h"

 #include "engines/wintermute/BViewport.h"

 #include "engines/wintermute/BFont.h"

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

 #include "engines/wintermute/BStringTable.h"

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

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

+#include "engines/wintermute/Ad/AdSentence.h"

+#include "engines/wintermute/Ad/AdResponse.h"

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

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

 #include "engines/wintermute/BSprite.h"

diff --git a/engines/wintermute/AdGame.h b/engines/wintermute/Ad/AdGame.h
index f330ef550a..8c146d1af3 100644
--- a/engines/wintermute/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -28,8 +28,8 @@
 #ifndef WINTERMUTE_ADGAME_H

 #define WINTERMUTE_ADGAME_H

 

-#include "AdTypes.h"

-#include "BGame.h"

+#include "engines/wintermute/Ad/AdTypes.h"

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

 

 namespace WinterMute {

 class CAdItem;

diff --git a/engines/wintermute/AdInventory.cpp b/engines/wintermute/Ad/AdInventory.cpp
index 2c7c086a73..693f09bcf6 100644
--- a/engines/wintermute/AdInventory.cpp
+++ b/engines/wintermute/Ad/AdInventory.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "AdInventory.h"

-#include "AdGame.h"

-#include "AdItem.h"

-#include "PlatformSDL.h"

+#include "engines/wintermute/Ad/AdInventory.h"

+#include "engines/wintermute/Ad/AdGame.h"

+#include "engines/wintermute/Ad/AdItem.h"

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdInventory.h b/engines/wintermute/Ad/AdInventory.h
index 9ea3ade9a2..b6f0c6399a 100644
--- a/engines/wintermute/AdInventory.h
+++ b/engines/wintermute/Ad/AdInventory.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORY_H

 #define WINTERMUTE_ADINVENTORY_H

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index b05072e0b9..5de9f54493 100644
--- a/engines/wintermute/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -25,19 +25,19 @@
  * http://dead-code.org/redir.php?target=wmelite

  * Copyright (c) 2011 Jan Nedoma

  */

-#include "dcgf.h"

-#include "AdGame.h"

-#include "AdInventoryBox.h"

-#include "AdInventory.h"

-#include "AdItem.h"

-#include "BGame.h"

-#include "BParser.h"

-#include "BFileManager.h"

-#include "BViewport.h"

-#include "BDynBuffer.h"

-#include "UIButton.h"

-#include "UIWindow.h"

-#include "PlatformSDL.h"

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

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

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

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

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

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

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

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

 #include "common/str.h"

 //#include <cmath>

 

diff --git a/engines/wintermute/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h
index 9f7dba6a2b..b7838607d2 100644
--- a/engines/wintermute/AdInventoryBox.h
+++ b/engines/wintermute/Ad/AdInventoryBox.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORYBOX_H

 #define WINTERMUTE_ADINVENTORYBOX_H

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 class CUIButton;

diff --git a/engines/wintermute/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 3b78fa5507..efd655c500 100644
--- a/engines/wintermute/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -27,9 +27,9 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

+#include "engines/wintermute/Ad/AdItem.h"

+#include "engines/wintermute/Ad/AdGame.h"

+#include "engines/wintermute/Ad/AdSentence.h"

 #include "engines/wintermute/BFontStorage.h"

 #include "engines/wintermute/BFont.h"

 #include "engines/wintermute/BFileManager.h"

diff --git a/engines/wintermute/AdItem.h b/engines/wintermute/Ad/AdItem.h
index 143f27fc87..0168ff7ca8 100644
--- a/engines/wintermute/AdItem.h
+++ b/engines/wintermute/Ad/AdItem.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADITEM_H

 

 

-#include "AdTalkHolder.h"

+#include "engines/wintermute/Ad/AdTalkHolder.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index b25dd57315..b6e7a8527e 100644
--- a/engines/wintermute/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BGame.h"

-#include "AdLayer.h"

-#include "AdSceneNode.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

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

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

+#include "engines/wintermute/Ad/AdLayer.h"

+#include "engines/wintermute/Ad/AdSceneNode.h"

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

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

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

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

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

-#include "BFileManager.h"

-#include "PlatformSDL.h"

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdLayer.h b/engines/wintermute/Ad/AdLayer.h
index 1c0e3fa946..1c0e3fa946 100644
--- a/engines/wintermute/AdLayer.h
+++ b/engines/wintermute/Ad/AdLayer.h
diff --git a/engines/wintermute/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 80858c4a2d..05ff99f7e0 100644
--- a/engines/wintermute/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -26,14 +26,14 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BGame.h"

-#include "AdNodeState.h"

-#include "AdEntity.h"

-#include "BStringTable.h"

-#include "BSprite.h"

-#include "utils.h"

-#include "PlatformSDL.h"

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

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

+#include "engines/wintermute/Ad/AdNodeState.h"

+#include "engines/wintermute/Ad/AdEntity.h"

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdNodeState.h b/engines/wintermute/Ad/AdNodeState.h
index 16445376ca..16445376ca 100644
--- a/engines/wintermute/AdNodeState.h
+++ b/engines/wintermute/Ad/AdNodeState.h
diff --git a/engines/wintermute/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 188eb19fc9..34903a8ccf 100644
--- a/engines/wintermute/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -26,16 +26,16 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/BFrame.h"

 #include "engines/wintermute/BSound.h"

diff --git a/engines/wintermute/AdObject.h b/engines/wintermute/Ad/AdObject.h
index 488cf6807f..5f47c0d394 100644
--- a/engines/wintermute/AdObject.h
+++ b/engines/wintermute/Ad/AdObject.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADOBJECT_H

 #define WINTERMUTE_ADOBJECT_H

 

-#include "AdTypes.h"

-#include "PartEmitter.h"

+#include "engines/wintermute/Ad/AdTypes.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdPath.cpp b/engines/wintermute/Ad/AdPath.cpp
index d9702005c0..210f13f68b 100644
--- a/engines/wintermute/AdPath.cpp
+++ b/engines/wintermute/Ad/AdPath.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdPath.h"

-#include "BPoint.h"

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

+#include "engines/wintermute/Ad/AdPath.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdPath.h b/engines/wintermute/Ad/AdPath.h
index efc7ffa265..d921e78c0a 100644
--- a/engines/wintermute/AdPath.h
+++ b/engines/wintermute/Ad/AdPath.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_ADPATH_H

 #define WINTERMUTE_ADPATH_H

 

-#include "persistent.h"

-#include "coll_templ.h"

-#include "BBase.h"

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

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

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

 

 namespace WinterMute {

 class CBPoint;

diff --git a/engines/wintermute/AdPathPoint.cpp b/engines/wintermute/Ad/AdPathPoint.cpp
index 6de03cc5c2..c66a7769f5 100644
--- a/engines/wintermute/AdPathPoint.cpp
+++ b/engines/wintermute/Ad/AdPathPoint.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "AdPathPoint.h"

-#include "BPersistMgr.h"

+#include "engines/wintermute/Ad/AdPathPoint.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdPathPoint.h b/engines/wintermute/Ad/AdPathPoint.h
index 86edade9d7..bb31223dbb 100644
--- a/engines/wintermute/AdPathPoint.h
+++ b/engines/wintermute/Ad/AdPathPoint.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADPATHPOINT_H

 #define WINTERMUTE_ADPATHPOINT_H

 

-#include "persistent.h"

-#include "BPoint.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index d928689cda..41022a85aa 100644
--- a/engines/wintermute/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -26,14 +26,14 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdRegion.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

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

+#include "engines/wintermute/Ad/AdRegion.h"

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

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

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

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

-#include "BGame.h"

-#include "BFileManager.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdRegion.h b/engines/wintermute/Ad/AdRegion.h
index 7c982ca4e1..37be803a9e 100644
--- a/engines/wintermute/AdRegion.h
+++ b/engines/wintermute/Ad/AdRegion.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADREGION_H

 #define WINTERMUTE_ADREGION_H

 

-#include "BRegion.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 9c76c0f4cc..3db37385b6 100644
--- a/engines/wintermute/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdResponse.h"

-#include "BGame.h"

-#include "BFontStorage.h"

-#include "BSprite.h"

-#include "utils.h"

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

+#include "engines/wintermute/Ad/AdResponse.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdResponse.h b/engines/wintermute/Ad/AdResponse.h
index 09608c913e..88f6fc03a8 100644
--- a/engines/wintermute/AdResponse.h
+++ b/engines/wintermute/Ad/AdResponse.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADRESPONSE_H

 

 

-#include "BObject.h"

-#include "AdTypes.h"

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

+#include "engines/wintermute/Ad/AdTypes.h"

 

 namespace WinterMute {

 class CBFont;

diff --git a/engines/wintermute/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 895ecd9bef..d50e25e088 100644
--- a/engines/wintermute/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -26,23 +26,23 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdGame.h"

-#include "AdResponseBox.h"

-#include "BParser.h"

-#include "BSurfaceStorage.h"

-#include "UIButton.h"

-#include "UIWindow.h"

-#include "BDynBuffer.h"

-#include "BFontStorage.h"

-#include "BFont.h"

-#include "AdResponse.h"

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

+#include "engines/wintermute/Ad/AdGame.h"

+#include "engines/wintermute/Ad/AdResponseBox.h"

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

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

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

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

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

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

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

+#include "engines/wintermute/Ad/AdResponse.h"

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

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

-#include "BSprite.h"

-#include "BFileManager.h"

-#include "utils.h"

-#include "PlatformSDL.h"

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h
index edc763a19b..cf98cfadca 100644
--- a/engines/wintermute/AdResponseBox.h
+++ b/engines/wintermute/Ad/AdResponseBox.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSEBOX_H

 

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdResponseContext.cpp b/engines/wintermute/Ad/AdResponseContext.cpp
index b29f9a42ba..482edbcb4d 100644
--- a/engines/wintermute/AdResponseContext.cpp
+++ b/engines/wintermute/Ad/AdResponseContext.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdResponseContext.h"

-#include "BPersistMgr.h"

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

+#include "engines/wintermute/Ad/AdResponseContext.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdResponseContext.h b/engines/wintermute/Ad/AdResponseContext.h
index 7bb91943e0..84ca44ef6f 100644
--- a/engines/wintermute/AdResponseContext.h
+++ b/engines/wintermute/Ad/AdResponseContext.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADRESPONSECONTEXT_H

 #define WINTERMUTE_ADRESPONSECONTEXT_H

 

-#include "persistent.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp
index 7645f19740..ea1681660a 100644
--- a/engines/wintermute/AdRotLevel.cpp
+++ b/engines/wintermute/Ad/AdRotLevel.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdRotLevel.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

-#include "BGame.h"

-#include "BSprite.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Ad/AdRotLevel.h"

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdRotLevel.h b/engines/wintermute/Ad/AdRotLevel.h
index a38027b281..dd3b318a34 100644
--- a/engines/wintermute/AdRotLevel.h
+++ b/engines/wintermute/Ad/AdRotLevel.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADROTLEVEL_H

 #define WINTERMUTE_ADROTLEVEL_H

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp
index cd36fb65b8..06729c6435 100644
--- a/engines/wintermute/AdScaleLevel.cpp
+++ b/engines/wintermute/Ad/AdScaleLevel.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdScaleLevel.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

-#include "BGame.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Ad/AdScaleLevel.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdScaleLevel.h b/engines/wintermute/Ad/AdScaleLevel.h
index 6f1776ea56..9cda5cf4d0 100644
--- a/engines/wintermute/AdScaleLevel.h
+++ b/engines/wintermute/Ad/AdScaleLevel.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCALELEVEL_H

 

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index c5e3d63db0..f7cd60c555 100644
--- a/engines/wintermute/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -26,38 +26,38 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "AdScene.h"

-#include "AdActor.h"

-#include "AdEntity.h"

-#include "AdGame.h"

-#include "AdLayer.h"

-#include "AdNodeState.h"

-#include "AdObject.h"

-#include "AdPath.h"

-#include "AdPathPoint.h"

-#include "AdRotLevel.h"

-#include "AdScaleLevel.h"

-#include "AdSceneNode.h"

-#include "AdSceneState.h"

-#include "AdSentence.h"

-#include "AdWaypointGroup.h"

-#include "BDynBuffer.h"

-#include "BFileManager.h"

-#include "BFont.h"

-#include "BGame.h"

-#include "BObject.h"

-#include "BParser.h"

-#include "BPoint.h"

-#include "BRegion.h"

-#include "BScriptable.h"

-#include "BSprite.h"

-#include "BViewport.h"

-#include "PlatformSDL.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#include "UIWindow.h"

-#include "utils.h"

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

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

 #include <math.h>

 #include <limits.h>

 

diff --git a/engines/wintermute/AdScene.h b/engines/wintermute/Ad/AdScene.h
index 4071068d15..87bd290970 100644
--- a/engines/wintermute/AdScene.h
+++ b/engines/wintermute/Ad/AdScene.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADSCENE_H

 #define WINTERMUTE_ADSCENE_H

 

-#include "BFader.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdSceneNode.cpp b/engines/wintermute/Ad/AdSceneNode.cpp
index 136836ac4a..d7d0ae98cc 100644
--- a/engines/wintermute/AdSceneNode.cpp
+++ b/engines/wintermute/Ad/AdSceneNode.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdSceneNode.h"

-#include "BGame.h"

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

+#include "engines/wintermute/Ad/AdSceneNode.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdSceneNode.h b/engines/wintermute/Ad/AdSceneNode.h
index 5514e5a40a..f6cc121fbc 100644
--- a/engines/wintermute/AdSceneNode.h
+++ b/engines/wintermute/Ad/AdSceneNode.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSCENENODE_H

 

 

-#include "AdTypes.h"    // Added by ClassView

-#include "AdRegion.h"   // Added by ClassView

-#include "AdEntity.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"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdSceneState.cpp b/engines/wintermute/Ad/AdSceneState.cpp
index 2404178b09..3a083498fe 100644
--- a/engines/wintermute/AdSceneState.cpp
+++ b/engines/wintermute/Ad/AdSceneState.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "persistent.h"

-#include "AdSceneState.h"

-#include "AdNodeState.h"

-#include "PlatformSDL.h"

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdSceneState.h b/engines/wintermute/Ad/AdSceneState.h
index 4f135d3b9c..264106b599 100644
--- a/engines/wintermute/AdSceneState.h
+++ b/engines/wintermute/Ad/AdSceneState.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_ADSCENESTATE_H

 #define WINTERMUTE_ADSCENESTATE_H

 

-#include "persistent.h"

-#include "BBase.h"

-#include "coll_templ.h"

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

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

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

 

 namespace WinterMute {

 class CAdNodeState;

diff --git a/engines/wintermute/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index 9665f36d1e..2395a4996c 100644
--- a/engines/wintermute/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -26,18 +26,18 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdSentence.h"

-#include "AdTalkDef.h"

-#include "AdTalkNode.h"

-#include "AdGame.h"

-#include "PathUtil.h"

-#include "BGame.h"

-#include "BSound.h"

-#include "AdScene.h"

-#include "BFont.h"

-#include "BSprite.h"

-#include "BFileManager.h"

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

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

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

+#include "engines/wintermute/Ad/AdScene.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdSentence.h b/engines/wintermute/Ad/AdSentence.h
index 4e36ad118d..495edceee0 100644
--- a/engines/wintermute/AdSentence.h
+++ b/engines/wintermute/Ad/AdSentence.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSENTENCE_H

 

 

-#include "BBase.h"

-#include "persistent.h"

-#include "dctypes.h"    // Added by ClassView

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

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

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

 

 namespace WinterMute {

 class CAdTalkDef;

diff --git a/engines/wintermute/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 351d3d2667..8ea4849e1c 100644
--- a/engines/wintermute/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdSpriteSet.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

-#include "BGame.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Ad/AdSpriteSet.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdSpriteSet.h b/engines/wintermute/Ad/AdSpriteSet.h
index c4b1f28069..4da0fded12 100644
--- a/engines/wintermute/AdSpriteSet.h
+++ b/engines/wintermute/Ad/AdSpriteSet.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADSPRITESET_H

 

 

-#include "BObject.h"

-#include "BSprite.h"    // Added by ClassView

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index d8ae610fcb..7a5091432f 100644
--- a/engines/wintermute/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -26,16 +26,16 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdTalkDef.h"

-#include "AdTalkNode.h"

-#include "BParser.h"

-#include "BGame.h"

-#include "BDynBuffer.h"

-#include "BSprite.h"

-#include "AdSpriteSet.h"

-#include "BFileManager.h"

-#include "utils.h"

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

+#include "engines/wintermute/Ad/AdTalkDef.h"

+#include "engines/wintermute/Ad/AdTalkNode.h"

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

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

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

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

+#include "engines/wintermute/Ad/AdSpriteSet.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdTalkDef.h b/engines/wintermute/Ad/AdTalkDef.h
index f6ed505cbb..7eaafcd6ec 100644
--- a/engines/wintermute/AdTalkDef.h
+++ b/engines/wintermute/Ad/AdTalkDef.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADTALKDEF_H

 #define WINTERMUTE_ADTALKDEF_H

 

-#include "coll_templ.h"

-#include "BObject.h"

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

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

 

 namespace WinterMute {

 class CAdTalkNode;

diff --git a/engines/wintermute/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp
index 48bab0b1c1..f5ae27967d 100644
--- a/engines/wintermute/AdTalkHolder.cpp
+++ b/engines/wintermute/Ad/AdTalkHolder.cpp
@@ -27,15 +27,15 @@
  */

 

 #define FORBIDDEN_SYMBOL_EXCEPTION_rand

-#include "dcgf.h"

-#include "AdTalkHolder.h"

-#include "BDynBuffer.h"

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

+#include "engines/wintermute/Ad/AdTalkHolder.h"

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

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

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

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

-#include "BGame.h"

-#include "BSprite.h"

-#include "PlatformSDL.h"

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdTalkHolder.h b/engines/wintermute/Ad/AdTalkHolder.h
index 66fb7c8e10..7c10783057 100644
--- a/engines/wintermute/AdTalkHolder.h
+++ b/engines/wintermute/Ad/AdTalkHolder.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADTALKHOLDER_H

 #define WINTERMUTE_ADTALKHOLDER_H

 

-#include "AdObject.h"

+#include "engines/wintermute/Ad/AdObject.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index 4d153e0452..f2f35539ff 100644
--- a/engines/wintermute/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -26,14 +26,14 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "AdTalkNode.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

-#include "BGame.h"

-#include "BSprite.h"

-#include "AdSpriteSet.h"

-#include "utils.h"

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

+#include "engines/wintermute/Ad/AdTalkNode.h"

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

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

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

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

+#include "engines/wintermute/Ad/AdSpriteSet.h"

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

 namespace WinterMute {

 

 IMPLEMENT_PERSISTENT(CAdTalkNode, false)

diff --git a/engines/wintermute/AdTalkNode.h b/engines/wintermute/Ad/AdTalkNode.h
index 89f541f6aa..18781f90da 100644
--- a/engines/wintermute/AdTalkNode.h
+++ b/engines/wintermute/Ad/AdTalkNode.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADTALKNODE_H

 #define WINTERMUTE_ADTALKNODE_H

 

-#include "persistent.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 class CAdSpriteSet;

diff --git a/engines/wintermute/AdTypes.h b/engines/wintermute/Ad/AdTypes.h
index 6531927350..6531927350 100644
--- a/engines/wintermute/AdTypes.h
+++ b/engines/wintermute/Ad/AdTypes.h
diff --git a/engines/wintermute/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index d85304b6f5..982079269e 100644
--- a/engines/wintermute/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "AdWaypointGroup.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

+#include "engines/wintermute/Ad/AdWaypointGroup.h"

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

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

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

-#include "BGame.h"

-#include "BRegion.h"

-#include "BFileManager.h"

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

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

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

 #include <limits.h>

 

 namespace WinterMute {

diff --git a/engines/wintermute/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h
index 0ce4d8040f..ea76bb50fa 100644
--- a/engines/wintermute/AdWaypointGroup.h
+++ b/engines/wintermute/Ad/AdWaypointGroup.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADWAYPOINTGROUP_H

 #define WINTERMUTE_ADWAYPOINTGROUP_H

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 class CBPoint;

diff --git a/engines/wintermute/BScriptHolder.cpp b/engines/wintermute/BScriptHolder.cpp
index da6c95c8a8..73e513dca3 100644
--- a/engines/wintermute/BScriptHolder.cpp
+++ b/engines/wintermute/BScriptHolder.cpp
@@ -27,7 +27,7 @@
  */

 

 #include "dcgf.h"

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

+#include "engines/wintermute/Ad/AdGame.h"

 #include "engines/wintermute/BScriptHolder.h"

 #include "engines/wintermute/BParser.h"

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

diff --git a/engines/wintermute/UIEntity.cpp b/engines/wintermute/UIEntity.cpp
index ce94d81519..958cb65284 100644
--- a/engines/wintermute/UIEntity.cpp
+++ b/engines/wintermute/UIEntity.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

+#include "engines/wintermute/Ad/AdEntity.h"

 #include "engines/wintermute/BGame.h"

 #include "engines/wintermute/BFileManager.h"

 #include "engines/wintermute/UIEntity.h"

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 70acdb5dec..7e1500da4e 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -13,35 +13,33 @@ MODULE_OBJS := \
 	scriptables/SXMemBuffer.o \
 	scriptables/SXStore.o \
 	scriptables/SXString.o \
-	graphics/transparentSurface.o \
-	graphics/tga.o \
-	AdActor.o \
-	AdActorDir.o \
-	AdEntity.o \
-	AdGame.o \
-	AdInventory.o \
-	AdInventoryBox.o \
-	AdItem.o \
-	AdLayer.o \
-	AdNodeState.o \
-	AdObject.o \
-	AdPath.o \
-	AdPathPoint.o \
-	AdRegion.o \
-	AdResponse.o \
-	AdResponseBox.o \
-	AdResponseContext.o \
-	AdRotLevel.o \
-	AdScaleLevel.o \
-	AdScene.o \
-	AdSceneNode.o \
-	AdSceneState.o \
-	AdSentence.o \
-	AdSpriteSet.o \
-	AdTalkDef.o \
-	AdTalkHolder.o \
-	AdTalkNode.o \
-	AdWaypointGroup.o \
+	Ad/AdActor.o \
+	Ad/AdActorDir.o \
+	Ad/AdEntity.o \
+	Ad/AdGame.o \
+	Ad/AdInventory.o \
+	Ad/AdInventoryBox.o \
+	Ad/AdItem.o \
+	Ad/AdLayer.o \
+	Ad/AdNodeState.o \
+	Ad/AdObject.o \
+	Ad/AdPath.o \
+	Ad/AdPathPoint.o \
+	Ad/AdRegion.o \
+	Ad/AdResponse.o \
+	Ad/AdResponseBox.o \
+	Ad/AdResponseContext.o \
+	Ad/AdRotLevel.o \
+	Ad/AdScaleLevel.o \
+	Ad/AdScene.o \
+	Ad/AdSceneNode.o \
+	Ad/AdSceneState.o \
+	Ad/AdSentence.o \
+	Ad/AdSpriteSet.o \
+	Ad/AdTalkDef.o \
+	Ad/AdTalkHolder.o \
+	Ad/AdTalkNode.o \
+	Ad/AdWaypointGroup.o \
 	BActiveRect.o \
 	BBase.o \
 	BDebugger.o \
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index d2473c8dd2..d91619710b 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -31,7 +31,7 @@
 #include "common/fs.h"
 
 #include "engines/util.h"
-#include "engines/wintermute/AdGame.h"
+#include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/wintermute.h"
 #include "engines/wintermute/PlatformSDL.h"