199 files changed, 800 insertions, 800 deletions

diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 9b30d16221..17c7b317a1 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/dctypes.h"

 #include "engines/wintermute/persistent.h"

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

@@ -38,14 +38,14 @@
 #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"

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

 #include <math.h>

diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/Ad/AdActor.h
index cbe5e2161e..0c00b19157 100644
--- a/engines/wintermute/Ad/AdActor.h
+++ b/engines/wintermute/Ad/AdActor.h
@@ -33,7 +33,7 @@
 #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/Base/BPoint.h" // Added by ClassView

 #include "engines/wintermute/persistent.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdActorDir.h b/engines/wintermute/Ad/AdActorDir.h
index 6408c51ad9..f3579ed72c 100644
--- a/engines/wintermute/Ad/AdActorDir.h
+++ b/engines/wintermute/Ad/AdActorDir.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADACTORDIR_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 1e492bbdca..6f628dfd72 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -30,26 +30,26 @@
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

 #include "engines/wintermute/utils.h"

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

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

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 4de2e70dae..bc0ba6a4e8 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -31,14 +31,14 @@
 #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"

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

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

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

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

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

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

+#include "engines/wintermute/Base/BTransitionMgr.h"

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

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

 #include "engines/wintermute/UIWindow.h"

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

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

 #include "engines/wintermute/UIEntity.h"

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

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

@@ -46,16 +46,16 @@
 #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/Base/BViewport.h"

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

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

+#include "engines/wintermute/Base/BStringTable.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"

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

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h
index 8c146d1af3..d4c6ae3b6f 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_ADGAME_H

 

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

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

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

 

 namespace WinterMute {

 class CAdItem;

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

 #define WINTERMUTE_ADINVENTORY_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 5de9f54493..4c6d2523d7 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -30,11 +30,11 @@
 #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/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/UIButton.h"

 #include "engines/wintermute/UIWindow.h"

 #include "engines/wintermute/PlatformSDL.h"

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

 #define WINTERMUTE_ADINVENTORYBOX_H

 

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

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

 

 namespace WinterMute {

 class CUIButton;

diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index efd655c500..343bc6c6fc 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -30,18 +30,18 @@
 #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"

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

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

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

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

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

+#include "engines/wintermute/Base/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/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index b6e7a8527e..8198bf492b 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -27,15 +27,15 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

+#include "engines/wintermute/Base/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 "engines/wintermute/BFileManager.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/PlatformSDL.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 05ff99f7e0..bd4dc1906c 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

+#include "engines/wintermute/Base/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/Base/BStringTable.h"

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

 #include "engines/wintermute/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 34903a8ccf..1f892f7eae 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -36,19 +36,19 @@
 #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"

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

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

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

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

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

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

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

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

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

-#include "engines/wintermute/scriptables/ScValue.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/BFont.h"

+#include "engines/wintermute/Base/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 "common/str.h"

 #include "common/util.h"

 

diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h
index 5f47c0d394..34873c89fc 100644
--- a/engines/wintermute/Ad/AdObject.h
+++ b/engines/wintermute/Ad/AdObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADOBJECT_H

 

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdPath.cpp b/engines/wintermute/Ad/AdPath.cpp
index 210f13f68b..9d2f1d555b 100644
--- a/engines/wintermute/Ad/AdPath.cpp
+++ b/engines/wintermute/Ad/AdPath.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdPath.h b/engines/wintermute/Ad/AdPath.h
index d921e78c0a..dbc769117a 100644
--- a/engines/wintermute/Ad/AdPath.h
+++ b/engines/wintermute/Ad/AdPath.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/coll_templ.h"

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

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

 

 namespace WinterMute {

 class CBPoint;

diff --git a/engines/wintermute/Ad/AdPathPoint.cpp b/engines/wintermute/Ad/AdPathPoint.cpp
index c66a7769f5..73d4976a6e 100644
--- a/engines/wintermute/Ad/AdPathPoint.cpp
+++ b/engines/wintermute/Ad/AdPathPoint.cpp
@@ -27,7 +27,7 @@
  */

 

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdPathPoint.h b/engines/wintermute/Ad/AdPathPoint.h
index bb31223dbb..cfa08d319b 100644
--- a/engines/wintermute/Ad/AdPathPoint.h
+++ b/engines/wintermute/Ad/AdPathPoint.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADPATHPOINT_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 41022a85aa..5ed3097b30 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -28,12 +28,12 @@
 

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

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

 

 namespace WinterMute {

 

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

 #define WINTERMUTE_ADREGION_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 3db37385b6..656d38f247 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -28,9 +28,9 @@
 

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

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

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

 #include "engines/wintermute/utils.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdResponse.h b/engines/wintermute/Ad/AdResponse.h
index 88f6fc03a8..42f2f90b14 100644
--- a/engines/wintermute/Ad/AdResponse.h
+++ b/engines/wintermute/Ad/AdResponse.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSE_H

 

 

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

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

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

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index d50e25e088..d81d1b5add 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -29,18 +29,18 @@
 #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/Base/BParser.h"

+#include "engines/wintermute/Base/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/Base/BDynBuffer.h"

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

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

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

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

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdResponseContext.cpp b/engines/wintermute/Ad/AdResponseContext.cpp
index 482edbcb4d..03904a1037 100644
--- a/engines/wintermute/Ad/AdResponseContext.cpp
+++ b/engines/wintermute/Ad/AdResponseContext.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdResponseContext.h b/engines/wintermute/Ad/AdResponseContext.h
index 84ca44ef6f..f29d943e19 100644
--- a/engines/wintermute/Ad/AdResponseContext.h
+++ b/engines/wintermute/Ad/AdResponseContext.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSECONTEXT_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp
index ea1681660a..fb1167f426 100644
--- a/engines/wintermute/Ad/AdRotLevel.cpp
+++ b/engines/wintermute/Ad/AdRotLevel.cpp
@@ -28,11 +28,11 @@
 

 #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"

+#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"

 

 namespace WinterMute {

 

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

 #define WINTERMUTE_ADROTLEVEL_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp
index 06729c6435..d417358c0c 100644
--- a/engines/wintermute/Ad/AdScaleLevel.cpp
+++ b/engines/wintermute/Ad/AdScaleLevel.cpp
@@ -28,10 +28,10 @@
 

 #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"

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

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

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

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

 

 namespace WinterMute {

 

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

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index f7cd60c555..c71d10207f 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -41,21 +41,21 @@
 #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/Base/BDynBuffer.h"

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

+#include "engines/wintermute/Base/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/PlatformSDL.h"

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

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

-#include "engines/wintermute/scriptables/ScScript.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/UIWindow.h"

 #include "engines/wintermute/utils.h"

 #include <math.h>

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

 #define WINTERMUTE_ADSCENE_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdSceneNode.cpp b/engines/wintermute/Ad/AdSceneNode.cpp
index d7d0ae98cc..aceff64873 100644
--- a/engines/wintermute/Ad/AdSceneNode.cpp
+++ b/engines/wintermute/Ad/AdSceneNode.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdSceneState.h b/engines/wintermute/Ad/AdSceneState.h
index 264106b599..6aa03792d2 100644
--- a/engines/wintermute/Ad/AdSceneState.h
+++ b/engines/wintermute/Ad/AdSceneState.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCENESTATE_H

 

 #include "engines/wintermute/persistent.h"

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

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

 #include "engines/wintermute/coll_templ.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index 2395a4996c..a280916734 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -32,12 +32,12 @@
 #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/Base/BGame.h"

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

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

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdSentence.h b/engines/wintermute/Ad/AdSentence.h
index 495edceee0..310be3e3e5 100644
--- a/engines/wintermute/Ad/AdSentence.h
+++ b/engines/wintermute/Ad/AdSentence.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSENTENCE_H

 

 

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

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

 #include "engines/wintermute/persistent.h"

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

 

diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 8ea4849e1c..4fc5a12c4c 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -28,10 +28,10 @@
 

 #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"

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

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

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

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

 

 namespace WinterMute {

 

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

 

 

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index 7a5091432f..d3c655bebe 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -29,12 +29,12 @@
 #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/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/BFileManager.h"

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

 #include "engines/wintermute/utils.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdTalkDef.h b/engines/wintermute/Ad/AdTalkDef.h
index 7eaafcd6ec..08abcaf32b 100644
--- a/engines/wintermute/Ad/AdTalkDef.h
+++ b/engines/wintermute/Ad/AdTalkDef.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKDEF_H

 

 #include "engines/wintermute/coll_templ.h"

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

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

 

 namespace WinterMute {

 class CAdTalkNode;

diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp
index f5ae27967d..61e012b261 100644
--- a/engines/wintermute/Ad/AdTalkHolder.cpp
+++ b/engines/wintermute/Ad/AdTalkHolder.cpp
@@ -29,12 +29,12 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_rand

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

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

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index f2f35539ff..2c68b188e6 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -28,10 +28,10 @@
 

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

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdTalkNode.h b/engines/wintermute/Ad/AdTalkNode.h
index 18781f90da..519b57add0 100644
--- a/engines/wintermute/Ad/AdTalkNode.h
+++ b/engines/wintermute/Ad/AdTalkNode.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKNODE_H

 

 #include "engines/wintermute/persistent.h"

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

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

 

 namespace WinterMute {

 class CAdSpriteSet;

diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 982079269e..7748cdca02 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -27,12 +27,12 @@
  */

 

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

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

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

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

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

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

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

 

 namespace WinterMute {

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

 #define WINTERMUTE_ADWAYPOINTGROUP_H

 

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

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

 

 namespace WinterMute {

 class CBPoint;

diff --git a/engines/wintermute/BActiveRect.cpp b/engines/wintermute/Base/BActiveRect.cpp
index b94c4d021f..5bb538b72f 100644
--- a/engines/wintermute/BActiveRect.cpp
+++ b/engines/wintermute/Base/BActiveRect.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BActiveRect.h"

-#include "BGame.h"

-#include "BRegion.h"

-#include "PlatformSDL.h"

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

+#include "engines/wintermute/Base/BActiveRect.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BActiveRect.h b/engines/wintermute/Base/BActiveRect.h
index 6ad5b93448..fe99f76ea1 100644
--- a/engines/wintermute/BActiveRect.h
+++ b/engines/wintermute/Base/BActiveRect.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BACTIVERECT_H

 #define WINTERMUTE_BACTIVERECT_H

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 class CBRegion;

diff --git a/engines/wintermute/BBase.cpp b/engines/wintermute/Base/BBase.cpp
index 543259b8d9..8f9d306824 100644
--- a/engines/wintermute/BBase.cpp
+++ b/engines/wintermute/Base/BBase.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BBase.h"

-#include "BGame.h"

-#include "BParser.h"

-#include "BDynBuffer.h"

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BBase.h b/engines/wintermute/Base/BBase.h
index eb1a1e7834..b815281f34 100644
--- a/engines/wintermute/BBase.h
+++ b/engines/wintermute/Base/BBase.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BBASE_H

 #define WINTERMUTE_BBASE_H

 

-#include "wintypes.h"

-#include "dctypes.h"

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

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

 #include "common/str.h"

 #include "common/hashmap.h"

 #include "common/hash-str.h"

diff --git a/engines/wintermute/BDebugger.cpp b/engines/wintermute/Base/BDebugger.cpp
index 62efc27bb5..d55cb189b7 100644
--- a/engines/wintermute/BDebugger.cpp
+++ b/engines/wintermute/Base/BDebugger.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BDebugger.h"

+#include "engines/wintermute/Base/BDebugger.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BDebugger.h b/engines/wintermute/Base/BDebugger.h
index bdae7823a0..52bfc51c55 100644
--- a/engines/wintermute/BDebugger.h
+++ b/engines/wintermute/Base/BDebugger.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BDEBUGGER_H

 

 

-#include "BBase.h"

-#include "wme_debugger.h"

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

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

 

 namespace WinterMute {

 class CScScript;

diff --git a/engines/wintermute/BDiskFile.cpp b/engines/wintermute/Base/BDiskFile.cpp
index c8301dde20..0d2b41f870 100644
--- a/engines/wintermute/BDiskFile.cpp
+++ b/engines/wintermute/Base/BDiskFile.cpp
@@ -26,14 +26,14 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BGame.h"

-#include "wintypes.h"

-#include "BPkgFile.h"

-#include "BDiskFile.h"

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

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

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

+#include "engines/wintermute/Base/BPkgFile.h"

+#include "engines/wintermute/Base/BDiskFile.h"

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

 #include "common/stream.h"

 #include "common/file.h"

-#include "BFileManager.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BDiskFile.h b/engines/wintermute/Base/BDiskFile.h
index 3cabe173e6..967e902dff 100644
--- a/engines/wintermute/BDiskFile.h
+++ b/engines/wintermute/Base/BDiskFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDISKFILE_H

 

 

-#include "BFile.h"

+#include "engines/wintermute/Base/BFile.h"

 

 namespace Common {

 class SeekableReadStream;

diff --git a/engines/wintermute/BDynBuffer.cpp b/engines/wintermute/Base/BDynBuffer.cpp
index 23cd1d2584..0e1c56d264 100644
--- a/engines/wintermute/BDynBuffer.cpp
+++ b/engines/wintermute/Base/BDynBuffer.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BGame.h"

-#include "BDynBuffer.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BDynBuffer.h b/engines/wintermute/Base/BDynBuffer.h
index 2b4d1d97bf..c90c464aad 100644
--- a/engines/wintermute/BDynBuffer.h
+++ b/engines/wintermute/Base/BDynBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDYNBUFFER_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BEvent.cpp b/engines/wintermute/Base/BEvent.cpp
index 2bf77803c4..c0cc5a2e4a 100644
--- a/engines/wintermute/BEvent.cpp
+++ b/engines/wintermute/Base/BEvent.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BGame.h"

-#include "BFileManager.h"

-#include "BEvent.h"

-#include "BParser.h"

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

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

+#include "engines/wintermute/Base/BEvent.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BEvent.h b/engines/wintermute/Base/BEvent.h
index 5afd57ce3a..a58f7d08d1 100644
--- a/engines/wintermute/BEvent.h
+++ b/engines/wintermute/Base/BEvent.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BEVENT_H

 

 

-#include "BBase.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFader.cpp b/engines/wintermute/Base/BFader.cpp
index ae716f6d3e..0769e8fd83 100644
--- a/engines/wintermute/BFader.cpp
+++ b/engines/wintermute/Base/BFader.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFader.h"

-#include "BGame.h"

-#include "PlatformSDL.h"

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

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

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

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

 #include "common/util.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BFader.h b/engines/wintermute/Base/BFader.h
index 9007a95de0..141f44f485 100644
--- a/engines/wintermute/BFader.h
+++ b/engines/wintermute/Base/BFader.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFADER_H

 

 

-#include "BObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFile.cpp b/engines/wintermute/Base/BFile.cpp
index 43b87027e2..ba75023c7f 100644
--- a/engines/wintermute/BFile.cpp
+++ b/engines/wintermute/Base/BFile.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFile.h"

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

+#include "engines/wintermute/Base/BFile.h"

 #include "common/memstream.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BFile.h b/engines/wintermute/Base/BFile.h
index eca8f4a416..ba20975b46 100644
--- a/engines/wintermute/BFile.h
+++ b/engines/wintermute/Base/BFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILE_H

 

 

-#include "BBase.h"

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

 #include "common/str.h"

 

 namespace Common {

diff --git a/engines/wintermute/BFileEntry.cpp b/engines/wintermute/Base/BFileEntry.cpp
index 447b7e85d7..aca145dcf1 100644
--- a/engines/wintermute/BFileEntry.cpp
+++ b/engines/wintermute/Base/BFileEntry.cpp
@@ -25,8 +25,8 @@
  * http://dead-code.org/redir.php?target=wmelite

  * Copyright (c) 2011 Jan Nedoma

  */

-#include "dcgf.h"

-#include "BFileEntry.h"

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

+#include "engines/wintermute/Base/BFileEntry.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFileEntry.h b/engines/wintermute/Base/BFileEntry.h
index 27a4f80eba..660c9cfd1f 100644
--- a/engines/wintermute/BFileEntry.h
+++ b/engines/wintermute/Base/BFileEntry.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILEENTRY_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp
index 8c14c1904f..99f64a4d3b 100644
--- a/engines/wintermute/BFileManager.cpp
+++ b/engines/wintermute/Base/BFileManager.cpp
@@ -28,21 +28,21 @@
 

 

 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "dcgf.h"

-#include "BFileManager.h"

-#include "StringUtil.h"

-#include "PathUtil.h"

-#include "BDiskFile.h"

-#include "BResourceFile.h"

-#include "BSaveThumbFile.h"

-#include "BFileEntry.h"

-#include "BPkgFile.h"

-#include "BPackage.h"

-#include "BRegistry.h"

-#include "BGame.h"

-#include "dcpackage.h"

-#include "utils.h"

-#include "PlatformSDL.h"

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

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

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

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

+#include "engines/wintermute/Base/BDiskFile.h"

+#include "engines/wintermute/Base/BResourceFile.h"

+#include "engines/wintermute/Base/BSaveThumbFile.h"

+#include "engines/wintermute/Base/BFileEntry.h"

+#include "engines/wintermute/Base/BPkgFile.h"

+#include "engines/wintermute/Base/BPackage.h"

+#include "engines/wintermute/Base/BRegistry.h"

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

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

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

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

 #include "common/str.h"

 #include "common/textconsole.h"

 #include "common/util.h"

diff --git a/engines/wintermute/BFileManager.h b/engines/wintermute/Base/BFileManager.h
index 0eb7d23a47..cf0e284cc1 100644
--- a/engines/wintermute/BFileManager.h
+++ b/engines/wintermute/Base/BFileManager.h
@@ -31,8 +31,8 @@
 

 

 //#include <map>

-#include "coll_templ.h"

-#include "BFileEntry.h"

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

+#include "engines/wintermute/Base/BFileEntry.h"

 #include "common/archive.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/BFont.cpp b/engines/wintermute/Base/BFont.cpp
index 82dfbb072b..0f2b248bee 100644
--- a/engines/wintermute/BFont.cpp
+++ b/engines/wintermute/Base/BFont.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFont.h"

-#include "BFontBitmap.h"

-#include "BParser.h"

-#include "BFileManager.h"

-#include "BFontTT.h"

-#include "BGame.h"

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

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

+#include "engines/wintermute/Base/BFontBitmap.h"

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

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

+#include "engines/wintermute/Base/BFontTT.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFont.h b/engines/wintermute/Base/BFont.h
index 453f567c96..0cfb5ed681 100644
--- a/engines/wintermute/BFont.h
+++ b/engines/wintermute/Base/BFont.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFONT_H

 #define WINTERMUTE_BFONT_H

 

-#include "BObject.h"

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

 

 #define NUM_CHARACTERS 256

 

diff --git a/engines/wintermute/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 7c659dbfad..98864f6ebd 100644
--- a/engines/wintermute/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -26,18 +26,18 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFontBitmap.h"

-#include "StringUtil.h"

-#include "BParser.h"

-#include "BFrame.h"

-#include "BSurface.h"

-#include "BGame.h"

-#include "BSubFrame.h"

-#include "BFrame.h"

-#include "BSprite.h"

-#include "BFileManager.h"

-#include "PlatformSDL.h"

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

+#include "engines/wintermute/Base/BFontBitmap.h"

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

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

+#include "engines/wintermute/Base/BFrame.h"

+#include "engines/wintermute/Base/BSurface.h"

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

+#include "engines/wintermute/Base/BSubFrame.h"

+#include "engines/wintermute/Base/BFrame.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BFontBitmap.h b/engines/wintermute/Base/BFontBitmap.h
index 0079e5a916..e22540b3c1 100644
--- a/engines/wintermute/BFontBitmap.h
+++ b/engines/wintermute/Base/BFontBitmap.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTBITMAP_H

 

 

-#include "BFont.h"

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

 

 namespace WinterMute {

 class CBSubFrame;

diff --git a/engines/wintermute/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp
index 67c522aabc..b34e24c286 100644
--- a/engines/wintermute/BFontStorage.cpp
+++ b/engines/wintermute/Base/BFontStorage.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFontStorage.h"

-#include "BGame.h"

-#include "BFont.h"

-#include "PlatformSDL.h"

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

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BFontStorage.h b/engines/wintermute/Base/BFontStorage.h
index 77f17f2382..c7d60d7bce 100644
--- a/engines/wintermute/BFontStorage.h
+++ b/engines/wintermute/Base/BFontStorage.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_BFONTSTORAGE_H

 

 

-#include "BBase.h"

-#include "persistent.h"

-#include "coll_templ.h"

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

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

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

 

 /*#include <ft2build.h>

 #include FT_FREETYPE_H*/

diff --git a/engines/wintermute/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index 94fdd81d0a..deb139859a 100644
--- a/engines/wintermute/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -28,20 +28,20 @@
 

 //#include <ft2build.h>

 //#include FT_FREETYPE_H

-#include "dcgf.h"

-#include "BFile.h"

-#include "BFontTT.h"

-#include "FontGlyphCache.h"

-#include "PathUtil.h"

-#include "StringUtil.h"

-#include "MathUtil.h"

-#include "BRenderSDL.h"

-#include "BSurfaceSDL.h"

-#include "BParser.h"

-#include "BGame.h"

-#include "BFileManager.h"

-#include "utils.h"

-#include "PlatformSDL.h"

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

+#include "engines/wintermute/Base/BFile.h"

+#include "engines/wintermute/Base/BFontTT.h"

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

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

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

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

+#include "engines/wintermute/Base/BRenderSDL.h"

+#include "engines/wintermute/Base/BSurfaceSDL.h"

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

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

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

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

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

 #include "graphics/fonts/ttf.h"

 #include "graphics/fontman.h"

 #include <limits.h>

diff --git a/engines/wintermute/BFontTT.h b/engines/wintermute/Base/BFontTT.h
index c1bd7e7023..22630a7444 100644
--- a/engines/wintermute/BFontTT.h
+++ b/engines/wintermute/Base/BFontTT.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_BFONTTT_H

 #define WINTERMUTE_BFONTTT_H

 

-#include "BFontStorage.h"

-#include "BFont.h"

-#include "BSurface.h"

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

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

+#include "engines/wintermute/Base/BSurface.h"

 #include "common/rect.h"

 #include "graphics/surface.h"

 #include "graphics/font.h"

diff --git a/engines/wintermute/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index 7d0fe61fd4..6fa61b5d51 100644
--- a/engines/wintermute/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -27,17 +27,17 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BFrame.h"

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

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

+#include "engines/wintermute/Base/BSoundMgr.h"

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

+#include "engines/wintermute/Base/BSubFrame.h"

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BFrame.h b/engines/wintermute/Base/BFrame.h
index 086a6106b3..ac7c88fbf7 100644
--- a/engines/wintermute/BFrame.h
+++ b/engines/wintermute/Base/BFrame.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BFRAME_H

 #define WINTERMUTE_BFRAME_H

 

-#include "BScriptable.h"

-#include "coll_templ.h"

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

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

 

 namespace WinterMute {

 class CBSound;

diff --git a/engines/wintermute/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 59d8f2b4fe..6b7df8c46b 100644
--- a/engines/wintermute/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -28,45 +28,45 @@
 

 #include <time.h>

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BFile.h"

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

+#include "engines/wintermute/Base/BFontTT.h"

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

+#include "engines/wintermute/Base/BImage.h"

+#include "engines/wintermute/Base/BKeyboardState.h"

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

+#include "engines/wintermute/Base/BQuickMsg.h"

+#include "engines/wintermute/Base/BRegistry.h"

+#include "engines/wintermute/Base/BRenderSDL.h"

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

+#include "engines/wintermute/Base/BSoundMgr.h"

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

+#include "engines/wintermute/Base/BSubFrame.h"

+#include "engines/wintermute/Base/BSurfaceSDL.h"

+#include "engines/wintermute/Base/BTransitionMgr.h"

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

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

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

+#include "engines/wintermute/Base/BSaveThumbHelper.h"

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

 #include "engines/wintermute/crc.h"

 #include "engines/wintermute/PathUtil.h"

 #include "engines/wintermute/StringUtil.h"

 #include "engines/wintermute/UIWindow.h"

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

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

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

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

-#include "engines/wintermute/scriptables/SXArray.h"

-#include "engines/wintermute/scriptables/SXDate.h"

-#include "engines/wintermute/scriptables/SXFile.h"

-#include "engines/wintermute/scriptables/SXMemBuffer.h"

-#include "engines/wintermute/scriptables/SxObject.h"

-#include "engines/wintermute/scriptables/SXMath.h"

-#include "engines/wintermute/scriptables/SXStore.h"

-#include "engines/wintermute/scriptables/SXString.h"

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

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

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

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

+#include "engines/wintermute/Base/scriptables/SXArray.h"

+#include "engines/wintermute/Base/scriptables/SXDate.h"

+#include "engines/wintermute/Base/scriptables/SXFile.h"

+#include "engines/wintermute/Base/scriptables/SXMemBuffer.h"

+#include "engines/wintermute/Base/scriptables/SxObject.h"

+#include "engines/wintermute/Base/scriptables/SXMath.h"

+#include "engines/wintermute/Base/scriptables/SXStore.h"

+#include "engines/wintermute/Base/scriptables/SXString.h"

 #include "common/textconsole.h"

 #include "common/util.h"

 #include "common/keyboard.h"

diff --git a/engines/wintermute/BGame.h b/engines/wintermute/Base/BGame.h
index 3a7e165b2c..ac8138855f 100644
--- a/engines/wintermute/BGame.h
+++ b/engines/wintermute/Base/BGame.h
@@ -29,14 +29,14 @@
 #ifndef WINTERMUTE_BGAME_H

 #define WINTERMUTE_BGAME_H

 

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

-//#include "BSaveThumbHelper.h"

-//#include "BFader.h"

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

-//#include "BSurfaceStorage.h"

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

+#include "engines/wintermute/Base/BDebugger.h"

+//#include "engines/wintermute/Base/BSaveThumbHelper.h"

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

+#include "engines/wintermute/Base/BRenderer.h"

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

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

 #include "engines/wintermute/persistent.h"

-#include "coll_templ.h"

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

 #include "common/events.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BImage.cpp b/engines/wintermute/Base/BImage.cpp
index 5f85215f7a..7561e65adc 100644
--- a/engines/wintermute/BImage.cpp
+++ b/engines/wintermute/Base/BImage.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BImage.h"

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

+#include "engines/wintermute/Base/BImage.h"

 //#include "FreeImage.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BImage.h b/engines/wintermute/Base/BImage.h
index 80a09fe60f..cabc155723 100644
--- a/engines/wintermute/BImage.h
+++ b/engines/wintermute/Base/BImage.h
@@ -31,7 +31,7 @@
 

 

 //#include "FreeImage.h"

-#include "BBase.h"

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

 #include "common/endian.h"

 

 struct FIBITMAP;

diff --git a/engines/wintermute/BKeyboardState.cpp b/engines/wintermute/Base/BKeyboardState.cpp
index eb1346e645..b81803e0ce 100644
--- a/engines/wintermute/BKeyboardState.cpp
+++ b/engines/wintermute/Base/BKeyboardState.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BKeyboardState.h"

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

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

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

+#include "engines/wintermute/Base/BKeyboardState.h"

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

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

 #include "common/system.h"

 #include "common/keyboard.h"

 

diff --git a/engines/wintermute/BKeyboardState.h b/engines/wintermute/Base/BKeyboardState.h
index 738f390eea..feed86df5e 100644
--- a/engines/wintermute/BKeyboardState.h
+++ b/engines/wintermute/Base/BKeyboardState.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BKEYBOARD_STATE_H

 

 

-#include "BBase.h"

-#include "BScriptable.h"

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

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

 #include "common/keyboard.h"

 #include "common/events.h"

 

diff --git a/engines/wintermute/BNamedObject.cpp b/engines/wintermute/Base/BNamedObject.cpp
index 13dfee0273..3c4652b731 100644
--- a/engines/wintermute/BNamedObject.cpp
+++ b/engines/wintermute/Base/BNamedObject.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BNamedObject.h"

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

+#include "engines/wintermute/Base/BNamedObject.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BNamedObject.h b/engines/wintermute/Base/BNamedObject.h
index c3e7e31aa4..ef1a3a444c 100644
--- a/engines/wintermute/BNamedObject.h
+++ b/engines/wintermute/Base/BNamedObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BNAMEDOBJECT_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BObject.cpp b/engines/wintermute/Base/BObject.cpp
index 56c988faea..046f31e4ac 100644
--- a/engines/wintermute/BObject.cpp
+++ b/engines/wintermute/Base/BObject.cpp
@@ -27,15 +27,15 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BSoundMgr.h"

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BObject.h b/engines/wintermute/Base/BObject.h
index 53f3aa794d..e2c3b25fd8 100644
--- a/engines/wintermute/BObject.h
+++ b/engines/wintermute/Base/BObject.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BOBJECT_H

 

 

-#include "BScriptHolder.h"

-#include "persistent.h"

+#include "engines/wintermute/Base/BScriptHolder.h"

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

 

 union SDL_Event;

 

diff --git a/engines/wintermute/BPackage.cpp b/engines/wintermute/Base/BPackage.cpp
index 0608fbcde1..976e9b3344 100644
--- a/engines/wintermute/BPackage.cpp
+++ b/engines/wintermute/Base/BPackage.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BPackage.h"

-#include "BGame.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Base/BPackage.h"

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

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

 #include "common/file.h"

 #include "common/stream.h"

 

diff --git a/engines/wintermute/BPackage.h b/engines/wintermute/Base/BPackage.h
index cd8bb14f40..80d8e481f2 100644
--- a/engines/wintermute/BPackage.h
+++ b/engines/wintermute/Base/BPackage.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPACKAGE_H

 

 

-#include "BBase.h"

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

 

 namespace Common {

 class SeekableReadStream;

diff --git a/engines/wintermute/BParser.cpp b/engines/wintermute/Base/BParser.cpp
index f672684f73..e3887f1acb 100644
--- a/engines/wintermute/BParser.cpp
+++ b/engines/wintermute/Base/BParser.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BParser.h"

-#include "BGame.h"

-#include "PlatformSDL.h"

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

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

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

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

 #include "common/str.h"

 #include "common/util.h"

 

diff --git a/engines/wintermute/BParser.h b/engines/wintermute/Base/BParser.h
index eb88467b7e..07764a97da 100644
--- a/engines/wintermute/BParser.h
+++ b/engines/wintermute/Base/BParser.h
@@ -52,8 +52,8 @@
 #define PARSERR_EOF             -2

 #define PARSERR_TOKENNOTFOUND   -1

 

-#include "BBase.h"

-#include "coll_templ.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BPersistMgr.cpp b/engines/wintermute/Base/BPersistMgr.cpp
index 4004375daf..e005c09591 100644
--- a/engines/wintermute/BPersistMgr.cpp
+++ b/engines/wintermute/Base/BPersistMgr.cpp
@@ -26,16 +26,16 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFileManager.h"

-#include "BGame.h"

-#include "BPersistMgr.h"

-#include "BSaveThumbHelper.h"

-#include "PlatformSDL.h"

-#include "Vector2.h"

-#include "StringUtil.h"

-#include "BImage.h"

-#include "BSound.h"

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

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

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

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

+#include "engines/wintermute/Base/BSaveThumbHelper.h"

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

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

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

+#include "engines/wintermute/Base/BImage.h"

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BPersistMgr.h b/engines/wintermute/Base/BPersistMgr.h
index 10e1c9e880..9049b72b3c 100644
--- a/engines/wintermute/BPersistMgr.h
+++ b/engines/wintermute/Base/BPersistMgr.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPERSISTMGR_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BPkgFile.cpp b/engines/wintermute/Base/BPkgFile.cpp
index b60b641daf..a48ccf7555 100644
--- a/engines/wintermute/BPkgFile.cpp
+++ b/engines/wintermute/Base/BPkgFile.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BPackage.h"

-#include "BPkgFile.h"

-#include "BGame.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Base/BPackage.h"

+#include "engines/wintermute/Base/BPkgFile.h"

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

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

 #include "common/util.h"

 #include "common/file.h"

 #include "common/stream.h"

diff --git a/engines/wintermute/BPkgFile.h b/engines/wintermute/Base/BPkgFile.h
index 4efbf21e0d..e2817f8a00 100644
--- a/engines/wintermute/BPkgFile.h
+++ b/engines/wintermute/Base/BPkgFile.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BPKGFILE_H

 

 

-#include "BFile.h"

-#include "BFileEntry.h"

+#include "engines/wintermute/Base/BFile.h"

+#include "engines/wintermute/Base/BFileEntry.h"

 #include <zlib.h>   // Added by ClassView

 

 #define COMPRESSED_BUFFER_SIZE 4096

diff --git a/engines/wintermute/BPoint.cpp b/engines/wintermute/Base/BPoint.cpp
index 2cab052b96..943e6d7843 100644
--- a/engines/wintermute/BPoint.cpp
+++ b/engines/wintermute/Base/BPoint.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BPoint.h"

-#include "BPersistMgr.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BPoint.h b/engines/wintermute/Base/BPoint.h
index 1517953ef8..7b9c561fac 100644
--- a/engines/wintermute/BPoint.h
+++ b/engines/wintermute/Base/BPoint.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BPOINT_H

 #define WINTERMUTE_BPOINT_H

 

-#include "persistent.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BQuickMsg.cpp b/engines/wintermute/Base/BQuickMsg.cpp
index 49425e7741..e425368929 100644
--- a/engines/wintermute/BQuickMsg.cpp
+++ b/engines/wintermute/Base/BQuickMsg.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BQuickMsg.h"

-#include "BGame.h"

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

+#include "engines/wintermute/Base/BQuickMsg.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BQuickMsg.h b/engines/wintermute/Base/BQuickMsg.h
index cd7b6b6fdc..3f03ef21fc 100644
--- a/engines/wintermute/BQuickMsg.h
+++ b/engines/wintermute/Base/BQuickMsg.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BQUICKMSG_H

 #define WINTERMUTE_BQUICKMSG_H

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index 37ab7ff35c..dd3c8db881 100644
--- a/engines/wintermute/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -27,14 +27,14 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BGame.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/BFileManager.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include <limits.h>

 

diff --git a/engines/wintermute/BRegion.h b/engines/wintermute/Base/BRegion.h
index c265495403..c2fe086655 100644
--- a/engines/wintermute/BRegion.h
+++ b/engines/wintermute/Base/BRegion.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BREGION_H

 #define WINTERMUTE_BREGION_H

 

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BRegistry.cpp b/engines/wintermute/Base/BRegistry.cpp
index 74d524189a..d918202ff1 100644
--- a/engines/wintermute/BRegistry.cpp
+++ b/engines/wintermute/Base/BRegistry.cpp
@@ -27,12 +27,12 @@
  */

 

 #include <fstream>

-#include "BGame.h"

-#include "BRegistry.h"

-#include "PathUtil.h"

-#include "StringUtil.h"

-#include "tinyxml.h"

-#include "utils.h"

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

+#include "engines/wintermute/Base/BRegistry.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BRegistry.h b/engines/wintermute/Base/BRegistry.h
index bd4466989e..1b2b5846b1 100644
--- a/engines/wintermute/BRegistry.h
+++ b/engines/wintermute/Base/BRegistry.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BREGISTRY_H

 #define WINTERMUTE_BREGISTRY_H

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BRenderSDL.cpp b/engines/wintermute/Base/BRenderSDL.cpp
index 9702fc140e..43b6134845 100644
--- a/engines/wintermute/BRenderSDL.cpp
+++ b/engines/wintermute/Base/BRenderSDL.cpp
@@ -27,14 +27,14 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

+#include "engines/wintermute/Base/BRenderSDL.h"

+#include "engines/wintermute/Base/BRegistry.h"

+#include "engines/wintermute/Base/BSurfaceSDL.h"

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

+#include "engines/wintermute/Base/BImage.h"

 #include "engines/wintermute/MathUtil.h"

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

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

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

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

 #include "common/system.h"

 #include "engines/wintermute/graphics/transparentSurface.h"

 

diff --git a/engines/wintermute/BRenderSDL.h b/engines/wintermute/Base/BRenderSDL.h
index 0c5760470e..73dc88d4be 100644
--- a/engines/wintermute/BRenderSDL.h
+++ b/engines/wintermute/Base/BRenderSDL.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BRENDERER_SDL_H

 #define WINTERMUTE_BRENDERER_SDL_H

 

-#include "BRenderer.h"

+#include "engines/wintermute/Base/BRenderer.h"

 #include "common/rect.h"

 #include "graphics/surface.h"

 

diff --git a/engines/wintermute/BRenderer.cpp b/engines/wintermute/Base/BRenderer.cpp
index 714981ea49..ba7b0bb405 100644
--- a/engines/wintermute/BRenderer.cpp
+++ b/engines/wintermute/Base/BRenderer.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BActiveRect.h"

-#include "BRenderer.h"

-#include "BSurface.h"

-#include "BSubFrame.h"

-#include "BRegion.h"

-#include "PlatformSDL.h"

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

+#include "engines/wintermute/Base/BActiveRect.h"

+#include "engines/wintermute/Base/BRenderer.h"

+#include "engines/wintermute/Base/BSurface.h"

+#include "engines/wintermute/Base/BSubFrame.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BRenderer.h b/engines/wintermute/Base/BRenderer.h
index bd2d23071b..91d0f211c6 100644
--- a/engines/wintermute/BRenderer.h
+++ b/engines/wintermute/Base/BRenderer.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BRENDERER_H

 

 

-#include "coll_templ.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BResourceFile.cpp b/engines/wintermute/Base/BResourceFile.cpp
index 83c2283db5..805868e5c8 100644
--- a/engines/wintermute/BResourceFile.cpp
+++ b/engines/wintermute/Base/BResourceFile.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BResourceFile.h"

-#include "BResources.h"

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

+#include "engines/wintermute/Base/BResourceFile.h"

+#include "engines/wintermute/Base/BResources.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BResourceFile.h b/engines/wintermute/Base/BResourceFile.h
index 17d396bd22..721134dd84 100644
--- a/engines/wintermute/BResourceFile.h
+++ b/engines/wintermute/Base/BResourceFile.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BRESOURCEFILE_H

 #define WINTERMUTE_BRESOURCEFILE_H

 

-#include "BFile.h"

+#include "engines/wintermute/Base/BFile.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BResources.cpp b/engines/wintermute/Base/BResources.cpp
index e63f1df307..d0714abaf2 100644
--- a/engines/wintermute/BResources.cpp
+++ b/engines/wintermute/Base/BResources.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "PlatformSDL.h"

-#include "BResources.h"

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

+#include "engines/wintermute/Base/BResources.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BResources.h b/engines/wintermute/Base/BResources.h
index 26d92af525..26d92af525 100644
--- a/engines/wintermute/BResources.h
+++ b/engines/wintermute/Base/BResources.h
diff --git a/engines/wintermute/BSaveThumbFile.cpp b/engines/wintermute/Base/BSaveThumbFile.cpp
index 67e3803a93..66f1e8a95f 100644
--- a/engines/wintermute/BSaveThumbFile.cpp
+++ b/engines/wintermute/Base/BSaveThumbFile.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BGame.h"

-#include "BSaveThumbFile.h"

-#include "PlatformSDL.h"

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

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

+#include "engines/wintermute/Base/BSaveThumbFile.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSaveThumbFile.h b/engines/wintermute/Base/BSaveThumbFile.h
index d5c6d54ebf..71bdb46431 100644
--- a/engines/wintermute/BSaveThumbFile.h
+++ b/engines/wintermute/Base/BSaveThumbFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSAVETHUMBFILE_H

 

 

-#include "BFile.h"

+#include "engines/wintermute/Base/BFile.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSaveThumbHelper.cpp b/engines/wintermute/Base/BSaveThumbHelper.cpp
index 6ae2f2013f..58ddbe5eca 100644
--- a/engines/wintermute/BSaveThumbHelper.cpp
+++ b/engines/wintermute/Base/BSaveThumbHelper.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BSaveThumbHelper.h"

-#include "BImage.h"

-#include "BGame.h"

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

+#include "engines/wintermute/Base/BSaveThumbHelper.h"

+#include "engines/wintermute/Base/BImage.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSaveThumbHelper.h b/engines/wintermute/Base/BSaveThumbHelper.h
index dfb587e194..36c21363c4 100644
--- a/engines/wintermute/BSaveThumbHelper.h
+++ b/engines/wintermute/Base/BSaveThumbHelper.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_BSAVETHUMBHELPER_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp
index 73e513dca3..2b575befa5 100644
--- a/engines/wintermute/BScriptHolder.cpp
+++ b/engines/wintermute/Base/BScriptHolder.cpp
@@ -26,14 +26,14 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BScriptHolder.h"

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BScriptHolder.h b/engines/wintermute/Base/BScriptHolder.h
index f094d6591a..83df7dc3e0 100644
--- a/engines/wintermute/BScriptHolder.h
+++ b/engines/wintermute/Base/BScriptHolder.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_BSCRIPTHOLDER_H

 #define WINTERMUTE_BSCRIPTHOLDER_H

 

-#include "coll_templ.h"

-#include "persistent.h"

-#include "BScriptable.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BScriptable.cpp b/engines/wintermute/Base/BScriptable.cpp
index 78faa0e8ca..b7dd2d5be1 100644
--- a/engines/wintermute/BScriptable.cpp
+++ b/engines/wintermute/Base/BScriptable.cpp
@@ -27,9 +27,9 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BScriptable.h b/engines/wintermute/Base/BScriptable.h
index 5682cfe8e0..5a24bde8e8 100644
--- a/engines/wintermute/BScriptable.h
+++ b/engines/wintermute/Base/BScriptable.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSCRIPTABLE_H

 

 

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

+#include "engines/wintermute/Base/BNamedObject.h"

 #include "engines/wintermute/wme_debugger.h"

 #include "engines/wintermute/persistent.h"

 

diff --git a/engines/wintermute/BSound.cpp b/engines/wintermute/Base/BSound.cpp
index d419e827b5..5df469934f 100644
--- a/engines/wintermute/BSound.cpp
+++ b/engines/wintermute/Base/BSound.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BSound.h"

-#include "BGame.h"

-#include "BSoundMgr.h"

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

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

+#include "engines/wintermute/Base/BSoundMgr.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSound.h b/engines/wintermute/Base/BSound.h
index 2acdaee464..a9d1a0b5af 100644
--- a/engines/wintermute/BSound.h
+++ b/engines/wintermute/Base/BSound.h
@@ -29,10 +29,10 @@
 #ifndef WINTERMUTE_BSOUND_H

 #define WINTERMUTE_BSOUND_H

 

-#include "BBase.h"

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

-#include "BSoundBuffer.h"

-#include "persistent.h"

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

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

+#include "engines/wintermute/Base/BSoundBuffer.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSoundBuffer.cpp b/engines/wintermute/Base/BSoundBuffer.cpp
index 6b689f59ca..9dcbbadf7e 100644
--- a/engines/wintermute/BSoundBuffer.cpp
+++ b/engines/wintermute/Base/BSoundBuffer.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFile.h"

-#include "BGame.h"

-#include "BSoundMgr.h"

-#include "BSoundBuffer.h"

-#include "BFileManager.h"

-#include "utils.h"

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

+#include "engines/wintermute/Base/BFile.h"

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

+#include "engines/wintermute/Base/BSoundMgr.h"

+#include "engines/wintermute/Base/BSoundBuffer.h"

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

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

 #include "audio/audiostream.h"

 #include "audio/mixer.h"

 #include "audio/decoders/vorbis.h"

diff --git a/engines/wintermute/BSoundBuffer.h b/engines/wintermute/Base/BSoundBuffer.h
index 312bb03f31..5445376555 100644
--- a/engines/wintermute/BSoundBuffer.h
+++ b/engines/wintermute/Base/BSoundBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSOUNDBUFFER_H

 

 

-#include "BBase.h"

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

 //#include "bass.h"

 

 namespace Audio {

diff --git a/engines/wintermute/BSoundMgr.cpp b/engines/wintermute/Base/BSoundMgr.cpp
index 6b0ae4e6a6..d0d757777f 100644
--- a/engines/wintermute/BSoundMgr.cpp
+++ b/engines/wintermute/Base/BSoundMgr.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BSoundMgr.h"

-#include "BRegistry.h"

-#include "PathUtil.h"

-#include "StringUtil.h"

-#include "BGame.h"

-#include "BFileManager.h"

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

+#include "engines/wintermute/Base/BSoundMgr.h"

+#include "engines/wintermute/Base/BRegistry.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSoundMgr.h b/engines/wintermute/Base/BSoundMgr.h
index 5cb130c081..f790693e71 100644
--- a/engines/wintermute/BSoundMgr.h
+++ b/engines/wintermute/Base/BSoundMgr.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_BSOUNDMGR_H

 #define WINTERMUTE_BSOUNDMGR_H

 

-#include "coll_templ.h"

-#include "BBase.h"

-#include "BSoundBuffer.h"

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

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

+#include "engines/wintermute/Base/BSoundBuffer.h"

 //#include "bass.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 2ecaf1831c..5720cd1f42 100644
--- a/engines/wintermute/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -27,21 +27,21 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

 #include "engines/wintermute/StringUtil.h"

 #include "engines/wintermute/PathUtil.h"

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BSurface.h"

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

+#include "engines/wintermute/Base/BFrame.h"

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

+#include "engines/wintermute/Base/BSubFrame.h"

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

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSprite.h b/engines/wintermute/Base/BSprite.h
index 085dafe8d8..8fa1656b37 100644
--- a/engines/wintermute/BSprite.h
+++ b/engines/wintermute/Base/BSprite.h
@@ -31,7 +31,7 @@
 

 

 #include "engines/wintermute/coll_templ.h"

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

+#include "engines/wintermute/Base/BScriptHolder.h"

 

 namespace WinterMute {

 class CBFrame;

diff --git a/engines/wintermute/BStringTable.cpp b/engines/wintermute/Base/BStringTable.cpp
index a8d10efd3c..f8196c5677 100644
--- a/engines/wintermute/BStringTable.cpp
+++ b/engines/wintermute/Base/BStringTable.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "PlatformSDL.h"

-#include "BFileManager.h"

-#include "BGame.h"

-#include "BStringTable.h"

-#include "StringUtil.h"

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

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

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BStringTable.h b/engines/wintermute/Base/BStringTable.h
index bbaf819eb7..57c75ef1e9 100644
--- a/engines/wintermute/BStringTable.h
+++ b/engines/wintermute/Base/BStringTable.h
@@ -31,7 +31,7 @@
 

 

 #include "common/hashmap.h"

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index 2e54e1a1ec..6b5d4e9f2e 100644
--- a/engines/wintermute/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -27,16 +27,16 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BSubFrame.h"

+#include "engines/wintermute/Base/BActiveRect.h"

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

+#include "engines/wintermute/Base/BSurface.h"

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

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

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSubFrame.h b/engines/wintermute/Base/BSubFrame.h
index 80c0cc6092..00462b1298 100644
--- a/engines/wintermute/BSubFrame.h
+++ b/engines/wintermute/Base/BSubFrame.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BSUBFRAME_H

 

 

-#include "BBase.h"

-#include "BScriptable.h"

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

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

 

 namespace WinterMute {

 class CBObject;

diff --git a/engines/wintermute/BSurface.cpp b/engines/wintermute/Base/BSurface.cpp
index d08ceee6ea..69b137813b 100644
--- a/engines/wintermute/BSurface.cpp
+++ b/engines/wintermute/Base/BSurface.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "wintypes.h"

-#include "BGame.h"

-#include "BSurface.h"

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

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

+#include "engines/wintermute/Base/BSurface.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSurface.h b/engines/wintermute/Base/BSurface.h
index bd22d48d01..a7279a9217 100644
--- a/engines/wintermute/BSurface.h
+++ b/engines/wintermute/Base/BSurface.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSURFACE_H

 #define WINTERMUTE_BSURFACE_H

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BSurfaceSDL.cpp b/engines/wintermute/Base/BSurfaceSDL.cpp
index 732bb45429..e4fc48d1e3 100644
--- a/engines/wintermute/BSurfaceSDL.cpp
+++ b/engines/wintermute/Base/BSurfaceSDL.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BFile.h"

-#include "BGame.h"

-#include "BSurfaceSDL.h"

-#include "BRenderSDL.h"

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

+#include "engines/wintermute/Base/BFile.h"

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

+#include "engines/wintermute/Base/BSurfaceSDL.h"

+#include "engines/wintermute/Base/BRenderSDL.h"

 //#include "SdlUtil.h"

 #include "graphics/decoders/png.h"

 #include "graphics/decoders/bmp.h"

@@ -39,8 +39,8 @@
 #include "engines/wintermute/graphics/transparentSurface.h"

 #include "engines/wintermute/graphics/tga.h"

 #include "common/stream.h"

-#include "BFileManager.h"

-#include "PlatformSDL.h"

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

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

 #include "common/system.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BSurfaceSDL.h b/engines/wintermute/Base/BSurfaceSDL.h
index ca9727331f..07c9b7cc6b 100644
--- a/engines/wintermute/BSurfaceSDL.h
+++ b/engines/wintermute/Base/BSurfaceSDL.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSURFACESDL_H

 

 #include "graphics/surface.h"

-#include "BSurface.h"

+#include "engines/wintermute/Base/BSurface.h"

 #include "graphics/surface.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BSurfaceStorage.cpp b/engines/wintermute/Base/BSurfaceStorage.cpp
index 567df7d1f5..538b9a2649 100644
--- a/engines/wintermute/BSurfaceStorage.cpp
+++ b/engines/wintermute/Base/BSurfaceStorage.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BSurfaceStorage.h"

-#include "BSurfaceSDL.h"

-#include "BGame.h"

-#include "BFileManager.h"

-#include "PlatformSDL.h"

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

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

+#include "engines/wintermute/Base/BSurfaceSDL.h"

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

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

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

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/BSurfaceStorage.h b/engines/wintermute/Base/BSurfaceStorage.h
index 6ebf2b3992..5491252557 100644
--- a/engines/wintermute/BSurfaceStorage.h
+++ b/engines/wintermute/Base/BSurfaceStorage.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BSURFACESTORAGE_H

 

 

-#include "coll_templ.h"

-#include "BBase.h"

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

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

 

 namespace WinterMute {

 class CBSurface;

diff --git a/engines/wintermute/BTransitionMgr.cpp b/engines/wintermute/Base/BTransitionMgr.cpp
index 177c10a980..74553f3031 100644
--- a/engines/wintermute/BTransitionMgr.cpp
+++ b/engines/wintermute/Base/BTransitionMgr.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

-#include "BTransitionMgr.h"

-#include "BGame.h"

-#include "PlatformSDL.h"

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

+#include "engines/wintermute/Base/BTransitionMgr.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BTransitionMgr.h b/engines/wintermute/Base/BTransitionMgr.h
index 2db5d4482e..01cdee8262 100644
--- a/engines/wintermute/BTransitionMgr.h
+++ b/engines/wintermute/Base/BTransitionMgr.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BTRANSITIONMGR_H

 #define WINTERMUTE_BTRANSITIONMGR_H

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BViewport.cpp b/engines/wintermute/Base/BViewport.cpp
index 397197a935..c8cff8f376 100644
--- a/engines/wintermute/BViewport.cpp
+++ b/engines/wintermute/Base/BViewport.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BGame.h"

-#include "PlatformSDL.h"

-#include "BViewport.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/BViewport.h b/engines/wintermute/Base/BViewport.h
index 98cc23ed25..640f54f438 100644
--- a/engines/wintermute/BViewport.h
+++ b/engines/wintermute/Base/BViewport.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BVIEWPORT_H

 

 

-#include "BBase.h"

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

 

 namespace WinterMute {

 class CBObject;

diff --git a/engines/wintermute/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index c0e03c25d0..ba3f688a34 100644
--- a/engines/wintermute/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -27,14 +27,14 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

 #include "engines/wintermute/Vector2.h"

 #include "engines/wintermute/Matrix4.h"

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

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

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

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

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

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

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

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

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

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

 #include "engines/wintermute/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

diff --git a/engines/wintermute/PartEmitter.h b/engines/wintermute/Base/PartEmitter.h
index 89a56a21a0..69ab35053d 100644
--- a/engines/wintermute/PartEmitter.h
+++ b/engines/wintermute/Base/PartEmitter.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_PARTEMITTER_H

 

 

-#include "BObject.h"

-#include "PartParticle.h"

-#include "PartForce.h"

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

+#include "engines/wintermute/Base/PartParticle.h"

+#include "engines/wintermute/Base/PartForce.h"

 

 namespace WinterMute {

 class CBRegion;

diff --git a/engines/wintermute/PartForce.cpp b/engines/wintermute/Base/PartForce.cpp
index 8431ebbda8..6389e38662 100644
--- a/engines/wintermute/PartForce.cpp
+++ b/engines/wintermute/Base/PartForce.cpp
@@ -28,8 +28,8 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/persistent.h"

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

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

+#include "engines/wintermute/Base/PartForce.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/PartForce.h b/engines/wintermute/Base/PartForce.h
index f4830b3039..b8f85bba2a 100644
--- a/engines/wintermute/PartForce.h
+++ b/engines/wintermute/Base/PartForce.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_PARTFORCE_H

 

 

-#include "BBase.h"

-#include "BNamedObject.h"

-#include "Vector2.h"

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

+#include "engines/wintermute/Base/BNamedObject.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp
index 8bbd54d3f9..5a17706ca6 100644
--- a/engines/wintermute/PartParticle.cpp
+++ b/engines/wintermute/Base/PartParticle.cpp
@@ -27,10 +27,10 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

+#include "engines/wintermute/Base/PartParticle.h"

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

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

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

 #include "engines/wintermute/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

diff --git a/engines/wintermute/PartParticle.h b/engines/wintermute/Base/PartParticle.h
index e72089ad5f..09eb7e8443 100644
--- a/engines/wintermute/PartParticle.h
+++ b/engines/wintermute/Base/PartParticle.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_PATRPARTICLE_H

 

 

-#include "BBase.h"

-#include "Vector2.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXArray.cpp b/engines/wintermute/Base/scriptables/SXArray.cpp
index d14660de4c..bd8962cc0c 100644
--- a/engines/wintermute/scriptables/SXArray.cpp
+++ b/engines/wintermute/Base/scriptables/SXArray.cpp
@@ -27,10 +27,10 @@
  */

 

 #include "engines/wintermute/persistent.h"

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

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

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

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

 #include "engines/wintermute/SysInstance.h"

-#include "engines/wintermute/scriptables/SXArray.h"

+#include "engines/wintermute/Base/scriptables/SXArray.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXArray.h b/engines/wintermute/Base/scriptables/SXArray.h
index 3a174946fd..d1cc4ce4db 100644
--- a/engines/wintermute/scriptables/SXArray.h
+++ b/engines/wintermute/Base/scriptables/SXArray.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SXARRAY_H

 #define WINTERMUTE_SXARRAY_H

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXDate.cpp b/engines/wintermute/Base/scriptables/SXDate.cpp
index d6b20fc3dc..e9cfc4b406 100644
--- a/engines/wintermute/scriptables/SXDate.cpp
+++ b/engines/wintermute/Base/scriptables/SXDate.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

-#include "engines/wintermute/scriptables/SXDate.h"

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

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

+#include "engines/wintermute/Base/scriptables/SXDate.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXDate.h b/engines/wintermute/Base/scriptables/SXDate.h
index cce3c5300e..7d4d29af93 100644
--- a/engines/wintermute/scriptables/SXDate.h
+++ b/engines/wintermute/Base/scriptables/SXDate.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXDATE_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index 5ffc69d1e7..ffff0e736d 100644
--- a/engines/wintermute/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -28,15 +28,15 @@
 

 #include "engines/wintermute/SysClassRegistry.h"

 #include "engines/wintermute/SysClass.h"

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

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

-#include "engines/wintermute/scriptables/ScScript.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/utils.h"

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

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

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

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

+#include "engines/wintermute/Base/BFile.h"

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

 #include "engines/wintermute/PlatformSDL.h"

-#include "engines/wintermute/scriptables/SXFile.h"

+#include "engines/wintermute/Base/scriptables/SXFile.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXFile.h b/engines/wintermute/Base/scriptables/SXFile.h
index 1900355dea..f05a0e11ec 100644
--- a/engines/wintermute/scriptables/SXFile.h
+++ b/engines/wintermute/Base/scriptables/SXFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTES_SXFILE_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXMath.cpp b/engines/wintermute/Base/scriptables/SXMath.cpp
index 59961fb5f1..8ac70581b9 100644
--- a/engines/wintermute/scriptables/SXMath.cpp
+++ b/engines/wintermute/Base/scriptables/SXMath.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/scriptables/SXMath.h"

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

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

+#include "engines/wintermute/Base/scriptables/SXMath.h"

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

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

 #include "engines/wintermute/persistent.h"

 #include <cmath>

 

diff --git a/engines/wintermute/scriptables/SXMath.h b/engines/wintermute/Base/scriptables/SXMath.h
index 59064c877f..0e61738161 100644
--- a/engines/wintermute/scriptables/SXMath.h
+++ b/engines/wintermute/Base/scriptables/SXMath.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMATH_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXMemBuffer.cpp b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
index 6f5bfee6bb..dd869477a1 100644
--- a/engines/wintermute/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
@@ -30,11 +30,11 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_fopen

 #define FORBIDDEN_SYMBOL_EXCEPTION_fwrite

 #define FORBIDDEN_SYMBOL_EXCEPTION_fclose

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

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

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

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

-#include "engines/wintermute/scriptables/SXMemBuffer.h"

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

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

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

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

+#include "engines/wintermute/Base/scriptables/SXMemBuffer.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXMemBuffer.h b/engines/wintermute/Base/scriptables/SXMemBuffer.h
index 824c0aaf77..54074b183d 100644
--- a/engines/wintermute/scriptables/SXMemBuffer.h
+++ b/engines/wintermute/Base/scriptables/SXMemBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMEMBUFFER_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp
index ef801feb89..3562392b13 100644
--- a/engines/wintermute/scriptables/SXStore.cpp
+++ b/engines/wintermute/Base/scriptables/SXStore.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

-#include "engines/wintermute/scriptables/SXStore.h"

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

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

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

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

+#include "engines/wintermute/Base/BRegistry.h"

+#include "engines/wintermute/Base/scriptables/SXStore.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/StringUtil.h"

 

 #ifdef __IPHONEOS__

diff --git a/engines/wintermute/scriptables/SXStore.h b/engines/wintermute/Base/scriptables/SXStore.h
index 4bcb4506d4..42fe6983e4 100644
--- a/engines/wintermute/scriptables/SXStore.h
+++ b/engines/wintermute/Base/scriptables/SXStore.h
@@ -28,9 +28,9 @@
 

 #ifndef WINTERMUTE_SXSTORE_H

 #define WINTERMUTE_SXSTORE_H

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

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

 #include "engines/wintermute/utils.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp
index 2837530ca0..408b892c05 100644
--- a/engines/wintermute/scriptables/SXString.cpp
+++ b/engines/wintermute/Base/scriptables/SXString.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

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

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

 #include "engines/wintermute/utils.h"

-#include "engines/wintermute/scriptables/SXString.h"

-#include "engines/wintermute/scriptables/SXArray.h"

+#include "engines/wintermute/Base/scriptables/SXString.h"

+#include "engines/wintermute/Base/scriptables/SXArray.h"

 #include "engines/wintermute/StringUtil.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/scriptables/SXString.h b/engines/wintermute/Base/scriptables/SXString.h
index 44e2bbe5ef..649a6c6f24 100644
--- a/engines/wintermute/scriptables/SXString.h
+++ b/engines/wintermute/Base/scriptables/SXString.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXSTRING_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp
index bb65b438de..9929fd7ce2 100644
--- a/engines/wintermute/scriptables/ScEngine.cpp
+++ b/engines/wintermute/Base/scriptables/ScEngine.cpp
@@ -27,16 +27,16 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

 #include "engines/wintermute/StringUtil.h"

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

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

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

-#include "engines/wintermute/scriptables/SXMath.h"

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

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

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

-#include "engines/wintermute/BFileManager.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/scriptables/SXMath.h"

+#include "engines/wintermute/Base/BRegistry.h"

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

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

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

 #include <algorithm>

 #include <vector>

 

diff --git a/engines/wintermute/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h
index ab1504e899..5e2e5861e7 100644
--- a/engines/wintermute/scriptables/ScEngine.h
+++ b/engines/wintermute/Base/scriptables/ScEngine.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/coll_templ.h"

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

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

 #include "engines/wintermute/wme_debugger.h"

 #include "engines/wintermute/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

diff --git a/engines/wintermute/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp
index 0b1f81bd0e..7a2f0db62a 100644
--- a/engines/wintermute/scriptables/ScScript.cpp
+++ b/engines/wintermute/Base/scriptables/ScScript.cpp
@@ -27,11 +27,11 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/ScScript.h b/engines/wintermute/Base/scriptables/ScScript.h
index ce9548fc99..226e6d8031 100644
--- a/engines/wintermute/scriptables/ScScript.h
+++ b/engines/wintermute/Base/scriptables/ScScript.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSCRIPT_H

 

 

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

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

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

 #include "engines/wintermute/coll_templ.h"

 

diff --git a/engines/wintermute/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp
index 0d097c69c7..26e8aa118b 100644
--- a/engines/wintermute/scriptables/ScStack.cpp
+++ b/engines/wintermute/Base/scriptables/ScStack.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/ScStack.h b/engines/wintermute/Base/scriptables/ScStack.h
index 811492c6ca..3e7f557cdd 100644
--- a/engines/wintermute/scriptables/ScStack.h
+++ b/engines/wintermute/Base/scriptables/ScStack.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSTACK_H

 

 

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

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

 #include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/persistent.h"

 

diff --git a/engines/wintermute/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp
index 8075df0e71..ed3778b635 100644
--- a/engines/wintermute/scriptables/ScValue.cpp
+++ b/engines/wintermute/Base/scriptables/ScValue.cpp
@@ -27,12 +27,12 @@
  */

 

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

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

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

 #include "engines/wintermute/StringUtil.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/scriptables/ScValue.h b/engines/wintermute/Base/scriptables/ScValue.h
index 5d10e9ff12..fedf3572f3 100644
--- a/engines/wintermute/scriptables/ScValue.h
+++ b/engines/wintermute/Base/scriptables/ScValue.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCVALUE_H

 

 

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

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

 #include "engines/wintermute/persistent.h"

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

 //#include <map>

diff --git a/engines/wintermute/scriptables/SxObject.cpp b/engines/wintermute/Base/scriptables/SxObject.cpp
index 1af01c1045..1af01c1045 100644
--- a/engines/wintermute/scriptables/SxObject.cpp
+++ b/engines/wintermute/Base/scriptables/SxObject.cpp
diff --git a/engines/wintermute/scriptables/SxObject.h b/engines/wintermute/Base/scriptables/SxObject.h
index 40e9046b5a..2a6ad36a58 100644
--- a/engines/wintermute/scriptables/SxObject.h
+++ b/engines/wintermute/Base/scriptables/SxObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXOBJECT_H

 

 

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/FontGlyphCache.h b/engines/wintermute/FontGlyphCache.h
index a385125d82..9b1cafe4cb 100644
--- a/engines/wintermute/FontGlyphCache.h
+++ b/engines/wintermute/FontGlyphCache.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_FONTGLYPHCACHE_H

 

 

-#include "BFontStorage.h"

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

 #include "graphics/surface.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/PathUtil.cpp b/engines/wintermute/PathUtil.cpp
index 336667525c..dc722e2389 100644
--- a/engines/wintermute/PathUtil.cpp
+++ b/engines/wintermute/PathUtil.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

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

 #include <algorithm>

 #include <fstream>

 #include "PathUtil.h"

diff --git a/engines/wintermute/PathUtil.h b/engines/wintermute/PathUtil.h
index 6bdabdc9d7..0bc883a1fa 100644
--- a/engines/wintermute/PathUtil.h
+++ b/engines/wintermute/PathUtil.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_PATHUTILS_H

 #define WINTERMUTE_PATHUTILS_H

 

-#include "PlatformSDL.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp
index 6cc18f5209..765c6ecd93 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/PlatformSDL.cpp
@@ -27,13 +27,13 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

+#include "engines/wintermute/Base/BRenderSDL.h"

 #include "engines/wintermute/PathUtil.h"

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

+#include "engines/wintermute/Base/BRegistry.h"

+#include "engines/wintermute/Base/BSoundMgr.h"

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

 #include "common/str.h"

 #include "common/textconsole.h"

 #include "common/system.h"

diff --git a/engines/wintermute/PlatformSDL.h b/engines/wintermute/PlatformSDL.h
index faf4a7e934..347d306378 100644
--- a/engines/wintermute/PlatformSDL.h
+++ b/engines/wintermute/PlatformSDL.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_PLATFORMSDL_H

 #define WINTERMUTE_PLATFORMSDL_H

 

-#include "dctypes.h"

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

 

-#include "wintypes.h"

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

 #include "common/events.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/StringUtil.cpp b/engines/wintermute/StringUtil.cpp
index 35b3bd6fc7..cd4f99e034 100644
--- a/engines/wintermute/StringUtil.cpp
+++ b/engines/wintermute/StringUtil.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

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

 #include <algorithm>

 #include <string>

 #include <sstream>

diff --git a/engines/wintermute/StringUtil.h b/engines/wintermute/StringUtil.h
index 5d3f1c668c..a4727fabbe 100644
--- a/engines/wintermute/StringUtil.h
+++ b/engines/wintermute/StringUtil.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_STRINGUTIL_H

 #define WINTERMUTE_STRINGUTIL_H

 

-#include "PlatformSDL.h"

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/SysClass.cpp b/engines/wintermute/SysClass.cpp
index 90ac06eb80..cd5bff0c8c 100644
--- a/engines/wintermute/SysClass.cpp
+++ b/engines/wintermute/SysClass.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "persistent.h"

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

 #include "SysInstance.h"

 #include "SysClass.h"

 #include "SysClassRegistry.h"

-#include "BGame.h"

-#include "BPersistMgr.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/SysClass.h b/engines/wintermute/SysClass.h
index df319b5d9b..3d6200997b 100644
--- a/engines/wintermute/SysClass.h
+++ b/engines/wintermute/SysClass.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_SYSCLASS_H

 #define WINTERMUTE_SYSCLASS_H

 

-#include "persistent.h"

-#include "dctypes.h"

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

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

 

 //#include <set>

 //#include <map>

diff --git a/engines/wintermute/SysClassRegistry.cpp b/engines/wintermute/SysClassRegistry.cpp
index bd86502023..25f271fab9 100644
--- a/engines/wintermute/SysClassRegistry.cpp
+++ b/engines/wintermute/SysClassRegistry.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "BGame.h"

-#include "PlatformSDL.h"

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

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

 #include "SysInstance.h"

 #include "SysClassRegistry.h"

 

diff --git a/engines/wintermute/SysClassRegistry.h b/engines/wintermute/SysClassRegistry.h
index 1f92c94164..5d437af324 100644
--- a/engines/wintermute/SysClassRegistry.h
+++ b/engines/wintermute/SysClassRegistry.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_SYSCLASSREGISTRY_H

 #define WINTERMUTE_SYSCLASSREGISTRY_H

 

-#include "wintypes.h"

-#include "dctypes.h"

-#include "persistent.h"

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

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

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

 //#include <set>

 //#include <map>

 #include "common/hashmap.h"

diff --git a/engines/wintermute/UIButton.cpp b/engines/wintermute/UIButton.cpp
index 70b2825027..a81320217e 100644
--- a/engines/wintermute/UIButton.cpp
+++ b/engines/wintermute/UIButton.cpp
@@ -27,21 +27,21 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

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

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

 #include "engines/wintermute/UIButton.h"

 #include "engines/wintermute/UITiledImage.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BActiveRect.h"

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UIButton.h b/engines/wintermute/UIButton.h
index 0d504fdea0..75133e2c0a 100644
--- a/engines/wintermute/UIButton.h
+++ b/engines/wintermute/UIButton.h
@@ -31,7 +31,7 @@
 

 

 #include "UIObject.h"

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UIEdit.cpp b/engines/wintermute/UIEdit.cpp
index 4e048117ba..00c91ba2e7 100644
--- a/engines/wintermute/UIEdit.cpp
+++ b/engines/wintermute/UIEdit.cpp
@@ -30,20 +30,20 @@
 #include "engines/wintermute/UIObject.h"

 #include "engines/wintermute/UITiledImage.h"

 #include "engines/wintermute/StringUtil.h"

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BActiveRect.h"

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

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

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

+#include "engines/wintermute/Base/BKeyboardState.h"

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

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

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

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

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

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 #include "engines/wintermute/utils.h"

 #include "common/util.h"

 #include "common/keyboard.h"

diff --git a/engines/wintermute/UIEdit.h b/engines/wintermute/UIEdit.h
index 9c2f4fddd4..3b8698d55d 100644
--- a/engines/wintermute/UIEdit.h
+++ b/engines/wintermute/UIEdit.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_UIEDIT_H

 #define WINTERMUTE_UIEDIT_H

 

-#include "persistent.h"

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

 #include "UIObject.h"

 #include "common/events.h"

 

diff --git a/engines/wintermute/UIEntity.cpp b/engines/wintermute/UIEntity.cpp
index 958cb65284..a864f7cbea 100644
--- a/engines/wintermute/UIEntity.cpp
+++ b/engines/wintermute/UIEntity.cpp
@@ -27,14 +27,14 @@
  */

 

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UIObject.cpp b/engines/wintermute/UIObject.cpp
index 153d04ada4..2bb860da3e 100644
--- a/engines/wintermute/UIObject.cpp
+++ b/engines/wintermute/UIObject.cpp
@@ -26,15 +26,15 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

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

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

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

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

 #include "engines/wintermute/UIObject.h"

 #include "engines/wintermute/UITiledImage.h"

 #include "engines/wintermute/UIWindow.h"

 #include "engines/wintermute/PlatformSDL.h"

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

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

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

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UIObject.h b/engines/wintermute/UIObject.h
index 6d5f463fca..7d6dfb41f5 100644
--- a/engines/wintermute/UIObject.h
+++ b/engines/wintermute/UIObject.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_UIOBJECT_H

 

 

-#include "BObject.h"

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

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

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

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/UIText.cpp b/engines/wintermute/UIText.cpp
index 194bff2390..64bb730fd4 100644
--- a/engines/wintermute/UIText.cpp
+++ b/engines/wintermute/UIText.cpp
@@ -27,19 +27,19 @@
  */

 

 #include "engines/wintermute/dcgf.h"

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

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

 #include "engines/wintermute/UIText.h"

 #include "engines/wintermute/UITiledImage.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BStringTable.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/PlatformSDL.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/UITiledImage.cpp b/engines/wintermute/UITiledImage.cpp
index 1f210fd89d..80618890f2 100644
--- a/engines/wintermute/UITiledImage.cpp
+++ b/engines/wintermute/UITiledImage.cpp
@@ -28,12 +28,12 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/UITiledImage.h"

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

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

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

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

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

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

+#include "engines/wintermute/Base/BSurface.h"

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

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

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

+#include "engines/wintermute/Base/BSubFrame.h"

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

 #include "engines/wintermute/PlatformSDL.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/UIWindow.cpp b/engines/wintermute/UIWindow.cpp
index 89980d8497..ac13170aaf 100644
--- a/engines/wintermute/UIWindow.cpp
+++ b/engines/wintermute/UIWindow.cpp
@@ -26,26 +26,26 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

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

 #include "engines/wintermute/UIWindow.h"

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BActiveRect.h"

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

+#include "engines/wintermute/Base/BKeyboardState.h"

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

 #include "engines/wintermute/UIButton.h"

 #include "engines/wintermute/UIEdit.h"

 #include "engines/wintermute/UIText.h"

 #include "engines/wintermute/UITiledImage.h"

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

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

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

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

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

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

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

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

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

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

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

+#include "engines/wintermute/Base/BStringTable.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/PlatformSDL.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/VidPlayer.cpp b/engines/wintermute/VidPlayer.cpp
index e6459e26f1..ab20135595 100644
--- a/engines/wintermute/VidPlayer.cpp
+++ b/engines/wintermute/VidPlayer.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include "dcgf.h"
+#include "engines/wintermute/dcgf.h"
 #include "VidPlayer.h"
 
 //#pragma comment(lib, "vfw32.lib")
diff --git a/engines/wintermute/VidPlayer.h b/engines/wintermute/VidPlayer.h
index e38baae413..a1abf2ea46 100644
--- a/engines/wintermute/VidPlayer.h
+++ b/engines/wintermute/VidPlayer.h
@@ -29,12 +29,12 @@
 #ifndef WINTERMUTE_VIDPLAYER_H
 #define WINTERMUTE_VIDPLAYER_H
 
-#include "dctypes.h"    // Added by ClassView
+#include "engines/wintermute/dctypes.h"    // Added by ClassView
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 
 #define MAX_AUDIO_STREAMS 5
 #define MAX_VIDEO_STREAMS 5
diff --git a/engines/wintermute/VidTheoraPlayer.cpp b/engines/wintermute/VidTheoraPlayer.cpp
index f802620bdd..509a7006e5 100644
--- a/engines/wintermute/VidTheoraPlayer.cpp
+++ b/engines/wintermute/VidTheoraPlayer.cpp
@@ -17,7 +17,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 
-#include "dcgf.h"
+#include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/vidtheoraplayer.h"
 
 //#pragma comment(lib, "libtheora.lib")
diff --git a/engines/wintermute/VidTheoraPlayer.h b/engines/wintermute/VidTheoraPlayer.h
index 6a32c307ad..38f3fe85ae 100644
--- a/engines/wintermute/VidTheoraPlayer.h
+++ b/engines/wintermute/VidTheoraPlayer.h
@@ -20,10 +20,10 @@
 #ifndef WINTERMUTE_VIDTHEORAPLAYER_H
 #define WINTERMUTE_VIDTHEORAPLAYER_H
 
-#include "engines/wintermute/BBase.h"
-#include "engines/wintermute/BFile.h"
-#include "engines/wintermute/BSurface.h"
-#include "engines/wintermute/BImage.h"
+#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/BSurface.h"
+#include "engines/wintermute/Base/BImage.h"
 //#include <theora/theora.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index 9c3a5ab15d..a5c02b313d 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -31,7 +31,7 @@
 

 

 #include <new>

-#include "BPersistMgr.h"

+#include "engines/wintermute/Base/BPersistMgr.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 7e1500da4e..5596cc5e46 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -1,18 +1,18 @@
 MODULE := engines/wintermute
  
 MODULE_OBJS := \
-	scriptables/ScEngine.o \
-	scriptables/ScScript.o \
-	scriptables/ScStack.o \
-	scriptables/ScValue.o \
-	scriptables/SXArray.o \
-	scriptables/SXDate.o \
-	scriptables/SXFile.o \
-	scriptables/SXMath.o \
-	scriptables/SxObject.o \
-	scriptables/SXMemBuffer.o \
-	scriptables/SXStore.o \
-	scriptables/SXString.o \
+	Base/scriptables/ScEngine.o \
+	Base/scriptables/ScScript.o \
+	Base/scriptables/ScStack.o \
+	Base/scriptables/ScValue.o \
+	Base/scriptables/SXArray.o \
+	Base/scriptables/SXDate.o \
+	Base/scriptables/SXFile.o \
+	Base/scriptables/SXMath.o \
+	Base/scriptables/SxObject.o \
+	Base/scriptables/SXMemBuffer.o \
+	Base/scriptables/SXStore.o \
+	Base/scriptables/SXString.o \
 	Ad/AdActor.o \
 	Ad/AdActorDir.o \
 	Ad/AdEntity.o \
@@ -40,52 +40,52 @@ MODULE_OBJS := \
 	Ad/AdTalkHolder.o \
 	Ad/AdTalkNode.o \
 	Ad/AdWaypointGroup.o \
-	BActiveRect.o \
-	BBase.o \
-	BDebugger.o \
-	BDiskFile.o \
-	BDynBuffer.o \
-	BFader.o \
-	BFile.o \
-	BFileEntry.o \
-	BFileManager.o \
-	BGame.o \
-	BFont.o \
-	BFontBitmap.o \
-	BFontStorage.o \
-	BFontTT.o \
-	BFrame.o \
-	BImage.o \
-	BKeyboardState.o \
-	BNamedObject.o \
-	BObject.o \
-	BPackage.o \
-	BParser.o \
-	BPersistMgr.o \
-	BPkgFile.o \
-	BPoint.o \
-	BQuickMsg.o \
-	BRegion.o \
-	BRegistry.o \
-	BRenderer.o \
-	BRenderSDL.o \
-	BResources.o \
-	BResourceFile.o \
-	BSaveThumbFile.o \
-	BSaveThumbHelper.o \
-	BScriptable.o \
-	BScriptHolder.o \
-	BSound.o \
-	BSoundBuffer.o \
-	BSoundMgr.o \
-	BSprite.o \
-	BStringTable.o \
-	BSubFrame.o \
-	BSurface.o \
-	BSurfaceSDL.o \
-	BSurfaceStorage.o \
-	BTransitionMgr.o \
-	BViewport.o \
+	Base/BActiveRect.o \
+	Base/BBase.o \
+	Base/BDebugger.o \
+	Base/BDiskFile.o \
+	Base/BDynBuffer.o \
+	Base/BFader.o \
+	Base/BFile.o \
+	Base/BFileEntry.o \
+	Base/BFileManager.o \
+	Base/BGame.o \
+	Base/BFont.o \
+	Base/BFontBitmap.o \
+	Base/BFontStorage.o \
+	Base/BFontTT.o \
+	Base/BFrame.o \
+	Base/BImage.o \
+	Base/BKeyboardState.o \
+	Base/BNamedObject.o \
+	Base/BObject.o \
+	Base/BPackage.o \
+	Base/BParser.o \
+	Base/BPersistMgr.o \
+	Base/BPkgFile.o \
+	Base/BPoint.o \
+	Base/BQuickMsg.o \
+	Base/BRegion.o \
+	Base/BRegistry.o \
+	Base/BRenderer.o \
+	Base/BRenderSDL.o \
+	Base/BResources.o \
+	Base/BResourceFile.o \
+	Base/BSaveThumbFile.o \
+	Base/BSaveThumbHelper.o \
+	Base/BScriptable.o \
+	Base/BScriptHolder.o \
+	Base/BSound.o \
+	Base/BSoundBuffer.o \
+	Base/BSoundMgr.o \
+	Base/BSprite.o \
+	Base/BStringTable.o \
+	Base/BSubFrame.o \
+	Base/BSurface.o \
+	Base/BSurfaceSDL.o \
+	Base/BSurfaceStorage.o \
+	Base/BTransitionMgr.o \
+	Base/BViewport.o \
 	ConvertUTF.o \
 	crc.o \
 	detection.o \
@@ -95,9 +95,9 @@ MODULE_OBJS := \
 	MathUtil.o \
 	Matrix4.o \
 	PathUtil.o \
-	PartParticle.o \
-	PartEmitter.o \
-	PartForce.o \
+	Base/PartParticle.o \
+	Base/PartEmitter.o \
+	Base/PartForce.o \
 	PlatformSDL.o \
 	StringUtil.o \
 	SysClass.o \
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index 7a63ff326c..d62ca006a8 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_PERSISTENT_H
 #define WINTERMUTE_PERSISTENT_H
 
-#include "wintypes.h"
+#include "engines/wintermute/wintypes.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/utils.cpp b/engines/wintermute/utils.cpp
index 7f17af9395..d1ce280639 100644
--- a/engines/wintermute/utils.cpp
+++ b/engines/wintermute/utils.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "dcgf.h"

+#include "engines/wintermute/dcgf.h"

 #include "utils.h"

-#include "PlatformSDL.h"

-#include "wintypes.h"

+#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/wintypes.h"

 #include "PathUtil.h"

-#include "BGame.h"

+#include "engines/wintermute/Base/BGame.h"

 #include "common/str.h"

 #include "common/textconsole.h"

 

diff --git a/engines/wintermute/utils.h b/engines/wintermute/utils.h
index fa83a51ad4..46e895ff4d 100644
--- a/engines/wintermute/utils.h
+++ b/engines/wintermute/utils.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_UTILS_H

 #define WINTERMUTE_UTILS_H

 

-#include "wintypes.h"

+#include "engines/wintermute/wintypes.h"

 

 namespace WinterMute {