48 files changed, 58 insertions, 58 deletions
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index bc0ba6a4e8..319709734c 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -37,9 +37,9 @@
 #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/UI/UIWindow.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/UIEntity.h"
+#include "engines/wintermute/UI/UIEntity.h"
 #include "engines/wintermute/Ad/AdScene.h"
 #include "engines/wintermute/Ad/AdEntity.h"
 #include "engines/wintermute/Ad/AdActor.h"
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 4c6d2523d7..1b80763cb4 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -35,8 +35,8 @@
 #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/UI/UIButton.h"
+#include "engines/wintermute/UI/UIWindow.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 //#include <cmath>
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index d81d1b5add..5d946b4895 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -31,8 +31,8 @@
 #include "engines/wintermute/Ad/AdResponseBox.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/UI/UIButton.h"
+#include "engines/wintermute/UI/UIWindow.h"
 #include "engines/wintermute/Base/BDynBuffer.h"
 #include "engines/wintermute/Base/BFontStorage.h"
 #include "engines/wintermute/Base/BFont.h"
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index c71d10207f..f3760dcb98 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -56,7 +56,7 @@
 #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/UI/UIWindow.h"
 #include "engines/wintermute/utils.h"
 #include <math.h>
 #include <limits.h>
diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index deb139859a..a52baeb70b 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/FontGlyphCache.h"
 #include "engines/wintermute/PathUtil.h"
 #include "engines/wintermute/StringUtil.h"
-#include "engines/wintermute/MathUtil.h"
+#include "engines/wintermute/math/MathUtil.h"
 #include "engines/wintermute/Base/BRenderSDL.h"
 #include "engines/wintermute/Base/BSurfaceSDL.h"
 #include "engines/wintermute/Base/BParser.h"
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 6b7df8c46b..dbeb010317 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -54,7 +54,7 @@
 #include "engines/wintermute/crc.h"
 #include "engines/wintermute/PathUtil.h"
 #include "engines/wintermute/StringUtil.h"
-#include "engines/wintermute/UIWindow.h"
+#include "engines/wintermute/UI/UIWindow.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScEngine.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
diff --git a/engines/wintermute/Base/BPersistMgr.cpp b/engines/wintermute/Base/BPersistMgr.cpp
index e005c09591..76156edc61 100644
--- a/engines/wintermute/Base/BPersistMgr.cpp
+++ b/engines/wintermute/Base/BPersistMgr.cpp
@@ -32,7 +32,7 @@
 #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/math/Vector2.h"
 #include "engines/wintermute/StringUtil.h"
 #include "engines/wintermute/Base/BImage.h"
 #include "engines/wintermute/Base/BSound.h"
diff --git a/engines/wintermute/Base/BRegistry.cpp b/engines/wintermute/Base/BRegistry.cpp
index d918202ff1..87d7c492c4 100644
--- a/engines/wintermute/Base/BRegistry.cpp
+++ b/engines/wintermute/Base/BRegistry.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/BRegistry.h"
 #include "engines/wintermute/PathUtil.h"
 #include "engines/wintermute/StringUtil.h"
-#include "engines/wintermute/tinyxml.h"
+#include "engines/wintermute/tinyxml/tinyxml.h"
 #include "engines/wintermute/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BRenderSDL.cpp b/engines/wintermute/Base/BRenderSDL.cpp
index 43b6134845..d8a27f67d7 100644
--- a/engines/wintermute/Base/BRenderSDL.cpp
+++ b/engines/wintermute/Base/BRenderSDL.cpp
@@ -32,7 +32,7 @@
 #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/math/MathUtil.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BSprite.h"
 #include "common/system.h"
diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index ba3f688a34..2667643882 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/PartEmitter.h"
-#include "engines/wintermute/Vector2.h"
-#include "engines/wintermute/Matrix4.h"
+#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/math/Matrix4.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/BGame.h"
diff --git a/engines/wintermute/Base/PartForce.h b/engines/wintermute/Base/PartForce.h
index b8f85bba2a..0754eebfdf 100644
--- a/engines/wintermute/Base/PartForce.h
+++ b/engines/wintermute/Base/PartForce.h
@@ -32,7 +32,7 @@
 
 #include "engines/wintermute/Base/BBase.h"
 #include "engines/wintermute/Base/BNamedObject.h"
-#include "engines/wintermute/Vector2.h"
+#include "engines/wintermute/math/Vector2.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/PartParticle.h b/engines/wintermute/Base/PartParticle.h
index 09eb7e8443..04f33c2cce 100644
--- a/engines/wintermute/Base/PartParticle.h
+++ b/engines/wintermute/Base/PartParticle.h
@@ -31,7 +31,7 @@
 
 
 #include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Vector2.h"
+#include "engines/wintermute/math/Vector2.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXArray.cpp b/engines/wintermute/Base/scriptables/SXArray.cpp
index bd8962cc0c..18118727da 100644
--- a/engines/wintermute/Base/scriptables/SXArray.cpp
+++ b/engines/wintermute/Base/scriptables/SXArray.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/SysInstance.h"
+#include "engines/wintermute/Sys/SysInstance.h"
 #include "engines/wintermute/Base/scriptables/SXArray.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index ffff0e736d..9e954cd1ef 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/SysClassRegistry.h"
-#include "engines/wintermute/SysClass.h"
+#include "engines/wintermute/Sys/SysClassRegistry.h"
+#include "engines/wintermute/Sys/SysClass.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScScript.h"
diff --git a/engines/wintermute/SysClass.cpp b/engines/wintermute/Sys/SysClass.cpp
index cd5bff0c8c..cd5bff0c8c 100644
--- a/engines/wintermute/SysClass.cpp
+++ b/engines/wintermute/Sys/SysClass.cpp
diff --git a/engines/wintermute/SysClass.h b/engines/wintermute/Sys/SysClass.h
index 3d6200997b..3d6200997b 100644
--- a/engines/wintermute/SysClass.h
+++ b/engines/wintermute/Sys/SysClass.h
diff --git a/engines/wintermute/SysClassRegistry.cpp b/engines/wintermute/Sys/SysClassRegistry.cpp
index 25f271fab9..25f271fab9 100644
--- a/engines/wintermute/SysClassRegistry.cpp
+++ b/engines/wintermute/Sys/SysClassRegistry.cpp
diff --git a/engines/wintermute/SysClassRegistry.h b/engines/wintermute/Sys/SysClassRegistry.h
index 5d437af324..5d437af324 100644
--- a/engines/wintermute/SysClassRegistry.h
+++ b/engines/wintermute/Sys/SysClassRegistry.h
diff --git a/engines/wintermute/SysInstance.cpp b/engines/wintermute/Sys/SysInstance.cpp
index 9e6a459bfc..9e6a459bfc 100644
--- a/engines/wintermute/SysInstance.cpp
+++ b/engines/wintermute/Sys/SysInstance.cpp
diff --git a/engines/wintermute/SysInstance.h b/engines/wintermute/Sys/SysInstance.h
index b8e2531c4b..b8e2531c4b 100644
--- a/engines/wintermute/SysInstance.h
+++ b/engines/wintermute/Sys/SysInstance.h
diff --git a/engines/wintermute/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index a81320217e..75cc3d5689 100644
--- a/engines/wintermute/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -29,8 +29,8 @@
 #include "engines/wintermute/dcgf.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/UI/UIButton.h"
+#include "engines/wintermute/UI/UITiledImage.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BActiveRect.h"
 #include "engines/wintermute/Base/BFontStorage.h"
diff --git a/engines/wintermute/UIButton.h b/engines/wintermute/UI/UIButton.h
index 75133e2c0a..75133e2c0a 100644
--- a/engines/wintermute/UIButton.h
+++ b/engines/wintermute/UI/UIButton.h
diff --git a/engines/wintermute/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 00c91ba2e7..3f2bc71996 100644
--- a/engines/wintermute/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/UIEdit.h"
-#include "engines/wintermute/UIObject.h"
-#include "engines/wintermute/UITiledImage.h"
+#include "engines/wintermute/UI/UIEdit.h"
+#include "engines/wintermute/UI/UIObject.h"
+#include "engines/wintermute/UI/UITiledImage.h"
 #include "engines/wintermute/StringUtil.h"
 #include "engines/wintermute/Base/BActiveRect.h"
 #include "engines/wintermute/Base/BFileManager.h"
diff --git a/engines/wintermute/UIEdit.h b/engines/wintermute/UI/UIEdit.h
index 3b8698d55d..3b8698d55d 100644
--- a/engines/wintermute/UIEdit.h
+++ b/engines/wintermute/UI/UIEdit.h
diff --git a/engines/wintermute/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index a864f7cbea..97565603f3 100644
--- a/engines/wintermute/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/Ad/AdEntity.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/UIEntity.h"
+#include "engines/wintermute/UI/UIEntity.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/BDynBuffer.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
diff --git a/engines/wintermute/UIEntity.h b/engines/wintermute/UI/UIEntity.h
index c18fd952dc..c18fd952dc 100644
--- a/engines/wintermute/UIEntity.h
+++ b/engines/wintermute/UI/UIEntity.h
diff --git a/engines/wintermute/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index 2bb860da3e..20a89c5897 100644
--- a/engines/wintermute/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -28,9 +28,9 @@
 
 #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/UI/UIObject.h"
+#include "engines/wintermute/UI/UITiledImage.h"
+#include "engines/wintermute/UI/UIWindow.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/Base/scriptables/ScStack.h"
diff --git a/engines/wintermute/UIObject.h b/engines/wintermute/UI/UIObject.h
index 7d6dfb41f5..7d6dfb41f5 100644
--- a/engines/wintermute/UIObject.h
+++ b/engines/wintermute/UI/UIObject.h
diff --git a/engines/wintermute/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 64bb730fd4..c2888e7393 100644
--- a/engines/wintermute/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/UIText.h"
-#include "engines/wintermute/UITiledImage.h"
+#include "engines/wintermute/UI/UIText.h"
+#include "engines/wintermute/UI/UITiledImage.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BParser.h"
 #include "engines/wintermute/Base/scriptables/ScValue.h"
diff --git a/engines/wintermute/UIText.h b/engines/wintermute/UI/UIText.h
index 756834fd5c..756834fd5c 100644
--- a/engines/wintermute/UIText.h
+++ b/engines/wintermute/UI/UIText.h
diff --git a/engines/wintermute/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp
index 80618890f2..9965ed5128 100644
--- a/engines/wintermute/UITiledImage.cpp
+++ b/engines/wintermute/UI/UITiledImage.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/UITiledImage.h"
+#include "engines/wintermute/UI/UITiledImage.h"
 #include "engines/wintermute/Base/BSurface.h"
 #include "engines/wintermute/Base/BDynBuffer.h"
 #include "engines/wintermute/Base/BParser.h"
diff --git a/engines/wintermute/UITiledImage.h b/engines/wintermute/UI/UITiledImage.h
index 03d15a0daa..03d15a0daa 100644
--- a/engines/wintermute/UITiledImage.h
+++ b/engines/wintermute/UI/UITiledImage.h
diff --git a/engines/wintermute/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index ac13170aaf..d364b27740 100644
--- a/engines/wintermute/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/UIWindow.h"
+#include "engines/wintermute/UI/UIWindow.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/UI/UIButton.h"
+#include "engines/wintermute/UI/UIEdit.h"
+#include "engines/wintermute/UI/UIText.h"
+#include "engines/wintermute/UI/UITiledImage.h"
 #include "engines/wintermute/Base/BViewport.h"
 #include "engines/wintermute/Base/BFontStorage.h"
 #include "engines/wintermute/Base/BFont.h"
diff --git a/engines/wintermute/UIWindow.h b/engines/wintermute/UI/UIWindow.h
index 510fc076b4..510fc076b4 100644
--- a/engines/wintermute/UIWindow.h
+++ b/engines/wintermute/UI/UIWindow.h
diff --git a/engines/wintermute/MathUtil.cpp b/engines/wintermute/math/MathUtil.cpp
index d6b526f5b6..d6b526f5b6 100644
--- a/engines/wintermute/MathUtil.cpp
+++ b/engines/wintermute/math/MathUtil.cpp
diff --git a/engines/wintermute/MathUtil.h b/engines/wintermute/math/MathUtil.h
index bacf975d62..bacf975d62 100644
--- a/engines/wintermute/MathUtil.h
+++ b/engines/wintermute/math/MathUtil.h
diff --git a/engines/wintermute/Matrix4.cpp b/engines/wintermute/math/Matrix4.cpp
index eefc8ae303..d9d17b613b 100644
--- a/engines/wintermute/Matrix4.cpp
+++ b/engines/wintermute/math/Matrix4.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Matrix4.h"
-#include "engines/wintermute/Vector2.h"
+#include "engines/wintermute/math/Matrix4.h"
+#include "engines/wintermute/math/Vector2.h"
 #include <math.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/Matrix4.h b/engines/wintermute/math/Matrix4.h
index da5fd1393a..da5fd1393a 100644
--- a/engines/wintermute/Matrix4.h
+++ b/engines/wintermute/math/Matrix4.h
diff --git a/engines/wintermute/Vector2.cpp b/engines/wintermute/math/Vector2.cpp
index b2fa56dff4..b2fa56dff4 100644
--- a/engines/wintermute/Vector2.cpp
+++ b/engines/wintermute/math/Vector2.cpp
diff --git a/engines/wintermute/Vector2.h b/engines/wintermute/math/Vector2.h
index aa3fe5aa86..aa3fe5aa86 100644
--- a/engines/wintermute/Vector2.h
+++ b/engines/wintermute/math/Vector2.h
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 5596cc5e46..8e929b0dcd 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -92,30 +92,30 @@ MODULE_OBJS := \
 	FontGlyphCache.o \
 	graphics/transparentSurface.o \
 	graphics/tga.o \
-	MathUtil.o \
-	Matrix4.o \
+	math/MathUtil.o \
+	math/Matrix4.o \
+	math/Vector2.o \
 	PathUtil.o \
 	Base/PartParticle.o \
 	Base/PartEmitter.o \
 	Base/PartForce.o \
 	PlatformSDL.o \
 	StringUtil.o \
-	SysClass.o \
-	SysClassRegistry.o \
-	SysInstance.o \
-	tinyxml.o \
-	tinystr.o \
-	tinyxmlparser.o \
-	tinyxmlerror.o \
-	UIButton.o \
-	UIEdit.o \
-	UIEntity.o \
-	UIObject.o \
-	UIText.o \
-	UITiledImage.o \
-	UIWindow.o \
+	Sys/SysClass.o \
+	Sys/SysClassRegistry.o \
+	Sys/SysInstance.o \
+	tinyxml/tinyxml.o \
+	tinyxml/tinystr.o \
+	tinyxml/tinyxmlparser.o \
+	tinyxml/tinyxmlerror.o \
+	UI/UIButton.o \
+	UI/UIEdit.o \
+	UI/UIEntity.o \
+	UI/UIObject.o \
+	UI/UIText.o \
+	UI/UITiledImage.o \
+	UI/UIWindow.o \
 	utils.o \
-	Vector2.o \
 	VidPlayer.o \
 	VidTheoraPlayer.o \
 	wintermute.o
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index d62ca006a8..fc9c4d674c 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -41,8 +41,8 @@ typedef HRESULT(WINAPI *PERSISTLOAD)(void *, CBPersistMgr *);
 typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data);
 } // end of namespace WinterMute
 
-#include "SysClass.h"
-#include "SysClassRegistry.h"
+#include "engines/wintermute/Sys/SysClass.h"
+#include "engines/wintermute/Sys/SysClassRegistry.h"
 namespace WinterMute {
 
 
diff --git a/engines/wintermute/tinystr.cpp b/engines/wintermute/tinyxml/tinystr.cpp
index 0665768205..0665768205 100644
--- a/engines/wintermute/tinystr.cpp
+++ b/engines/wintermute/tinyxml/tinystr.cpp
diff --git a/engines/wintermute/tinystr.h b/engines/wintermute/tinyxml/tinystr.h
index 89cca33415..89cca33415 100644
--- a/engines/wintermute/tinystr.h
+++ b/engines/wintermute/tinyxml/tinystr.h
diff --git a/engines/wintermute/tinyxml.cpp b/engines/wintermute/tinyxml/tinyxml.cpp
index 4ff47d1432..e4a0c2780f 100644
--- a/engines/wintermute/tinyxml.cpp
+++ b/engines/wintermute/tinyxml/tinyxml.cpp
@@ -29,7 +29,7 @@ distribution.
 #include <iostream>
 #endif
 
-#include "engines/wintermute/tinyxml.h"
+#include "engines/wintermute/tinyxml/tinyxml.h"
 
 
 bool TiXmlBase::condenseWhiteSpace = true;
diff --git a/engines/wintermute/tinyxml.h b/engines/wintermute/tinyxml/tinyxml.h
index afb07cfbed..afb07cfbed 100644
--- a/engines/wintermute/tinyxml.h
+++ b/engines/wintermute/tinyxml/tinyxml.h
diff --git a/engines/wintermute/tinyxmlerror.cpp b/engines/wintermute/tinyxml/tinyxmlerror.cpp
index d24f63b2e5..d24f63b2e5 100644
--- a/engines/wintermute/tinyxmlerror.cpp
+++ b/engines/wintermute/tinyxml/tinyxmlerror.cpp
diff --git a/engines/wintermute/tinyxmlparser.cpp b/engines/wintermute/tinyxml/tinyxmlparser.cpp
index 14fd7c8c79..14fd7c8c79 100644
--- a/engines/wintermute/tinyxmlparser.cpp
+++ b/engines/wintermute/tinyxml/tinyxmlparser.cpp