TOON: Normalized include paths

svn-id: r53089

34 files changed, 70 insertions, 68 deletions

diff --git a/engines/toon/anim.cpp b/engines/toon/anim.cpp
index 0ccbabcbae..c5b1ca14a9 100644
--- a/engines/toon/anim.cpp
+++ b/engines/toon/anim.cpp
@@ -23,9 +23,9 @@
  *
  */
 
-#include "anim.h"
-#include "toon.h"
-#include "tools.h"
+#include "toon/anim.h"
+#include "toon/toon.h"
+#include "toon/tools.h"
 
 namespace Toon {
 
diff --git a/engines/toon/anim.h b/engines/toon/anim.h
index 85e09451b4..dbfd7eda54 100644
--- a/engines/toon/anim.h
+++ b/engines/toon/anim.h
@@ -31,7 +31,7 @@
 #include "common/func.h"
 #include "graphics/surface.h"
 
-#include "script.h"
+#include "toon/script.h"
 
 namespace Toon {
 
diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index e3e3b486ec..2ef836ecf7 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "audio.h"
+#include "toon/audio.h"
 
 namespace Toon {
 
diff --git a/engines/toon/audio.h b/engines/toon/audio.h
index 178e8162c7..7c62ea3e7e 100644
--- a/engines/toon/audio.h
+++ b/engines/toon/audio.h
@@ -28,7 +28,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 5a743ee8e1..67221607c6 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -23,9 +23,9 @@
 *
 */
 
-#include "character.h"
-#include "drew.h"
-#include "path.h"
+#include "toon/character.h"
+#include "toon/drew.h"
+#include "toon/path.h"
 
 namespace Toon {
 
diff --git a/engines/toon/character.h b/engines/toon/character.h
index 05da6d06ab..e02e28fe22 100644
--- a/engines/toon/character.h
+++ b/engines/toon/character.h
@@ -26,7 +26,7 @@
 #ifndef TOON_CHARACTER_H
 #define TOON_CHARACTER_H
 
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/conversation.cpp b/engines/toon/conversation.cpp
index 313112789b..1bb8dcb9fe 100644
--- a/engines/toon/conversation.cpp
+++ b/engines/toon/conversation.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "conversation.h"
+#include "toon/conversation.h"
 
 namespace Toon {
 
@@ -46,4 +46,4 @@ void Conversation::load(Common::ReadStream *stream, int16* conversationDataBase)
 }
 
 
-}
\ No newline at end of file
+}
diff --git a/engines/toon/conversation.h b/engines/toon/conversation.h
index 0035ae67cc..03a3aeaa70 100644
--- a/engines/toon/conversation.h
+++ b/engines/toon/conversation.h
@@ -28,6 +28,7 @@
 
 #include "engines/engine.h"
 #include "common/stream.h"
+
 namespace Toon {
 
 class Conversation {
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 77df44e020..66b7f80a08 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "base/plugins.h"
 #include "graphics/thumbnail.h"
-#include "toon.h"
+#include "toon/toon.h"
 
 static const PlainGameDescriptor ToonGames[] = {
 	{ "toon", "Toonstruck" },
diff --git a/engines/toon/drew.cpp b/engines/toon/drew.cpp
index 66ca99b268..b079bfc9a0 100644
--- a/engines/toon/drew.cpp
+++ b/engines/toon/drew.cpp
@@ -23,7 +23,7 @@
  *
  */
  
- #include "drew.h"
+#include "toon/drew.h"
 
 namespace Toon {
 
diff --git a/engines/toon/drew.h b/engines/toon/drew.h
index bd0d070265..a5be4c76c3 100644
--- a/engines/toon/drew.h
+++ b/engines/toon/drew.h
@@ -26,7 +26,7 @@
 #ifndef TOON_DREW_H
 #define TOON_DREW_H
 
-#include "character.h"
+#include "toon/character.h"
 
 
 namespace Toon {
diff --git a/engines/toon/flux.cpp b/engines/toon/flux.cpp
index 942dac5af4..4d451b2ff1 100644
--- a/engines/toon/flux.cpp
+++ b/engines/toon/flux.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "flux.h"
+#include "toon/flux.h"
 
 namespace Toon {
 
diff --git a/engines/toon/flux.h b/engines/toon/flux.h
index c76b538ba9..ca67cfc563 100644
--- a/engines/toon/flux.h
+++ b/engines/toon/flux.h
@@ -27,7 +27,7 @@
 #define TOON_FLUX_H
 
 
-#include "character.h"
+#include "toon/character.h"
 
 class ToonEngine;
 
diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index cec7515db9..603d91d9d3 100644
--- a/engines/toon/font.cpp
+++ b/engines/toon/font.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "font.h"
+#include "toon/font.h"
 
 namespace Toon {
 
diff --git a/engines/toon/font.h b/engines/toon/font.h
index e6e765654c..713d8c3409 100644
--- a/engines/toon/font.h
+++ b/engines/toon/font.h
@@ -26,7 +26,7 @@
 #ifndef TOON_FONT_H
 #define TOON_FONT_H
 
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/hotspot.cpp b/engines/toon/hotspot.cpp
index ed9494ee1f..d29e4f55a6 100644
--- a/engines/toon/hotspot.cpp
+++ b/engines/toon/hotspot.cpp
@@ -23,8 +23,8 @@
 *
 */
 
-#include "hotspot.h"
-#include "tools.h"
+#include "toon/hotspot.h"
+#include "toon/tools.h"
 
 namespace Toon {
 
diff --git a/engines/toon/hotspot.h b/engines/toon/hotspot.h
index 0ce2a833a7..9f119635bb 100644
--- a/engines/toon/hotspot.h
+++ b/engines/toon/hotspot.h
@@ -26,8 +26,8 @@
 #ifndef TOON_HOTSPOT_H
 #define TOON_HOTSPOT_H
 
-#include "toon.h"
-#include "tools.h"
+#include "toon/toon.h"
+#include "toon/tools.h"
 
 namespace Toon {
 
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 9918c3e38f..f01dd90d9c 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "movie.h"
+#include "toon/movie.h"
 
 namespace Toon {
 
diff --git a/engines/toon/movie.h b/engines/toon/movie.h
index ef9076df28..01da038286 100644
--- a/engines/toon/movie.h
+++ b/engines/toon/movie.h
@@ -26,7 +26,7 @@
 #ifndef TOON_MOVIE_H
 #define TOON_MOVIE_H
 
-#include "toon.h"
+#include "toon/toon.h"
 #include "graphics/video/smk_decoder.h"
 
 namespace Toon {
diff --git a/engines/toon/path.cpp b/engines/toon/path.cpp
index fbc9d64ddb..bbd6a7bf2f 100644
--- a/engines/toon/path.cpp
+++ b/engines/toon/path.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "path.h"
+#include "toon/path.h"
 
 namespace Toon {
 
diff --git a/engines/toon/path.h b/engines/toon/path.h
index 2de5b8bb77..4846206008 100644
--- a/engines/toon/path.h
+++ b/engines/toon/path.h
@@ -26,7 +26,7 @@
 #ifndef TOON_PATH_H
 #define TOON_PATH_H
 
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp
index ae1b2abb65..c14d91b1e8 100644
--- a/engines/toon/picture.cpp
+++ b/engines/toon/picture.cpp
@@ -23,8 +23,8 @@
 *
 */
 
-#include "picture.h"
-#include "tools.h"
+#include "toon/picture.h"
+#include "toon/tools.h"
 #include "common/stack.h"
 
 namespace Toon {
diff --git a/engines/toon/picture.h b/engines/toon/picture.h
index ae67bf4e30..917c66cb93 100644
--- a/engines/toon/picture.h
+++ b/engines/toon/picture.h
@@ -31,7 +31,7 @@
 #include "common/func.h"
 #include "common/str.h"
 
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/resource.cpp b/engines/toon/resource.cpp
index 35250f756a..2757c50f00 100644
--- a/engines/toon/resource.cpp
+++ b/engines/toon/resource.cpp
@@ -23,9 +23,9 @@
 *
 */
 
-#include "resource.h"
+#include "toon/resource.h"
 #include "common/file.h"
-#include "toon.h"
+#include "toon/toon.h"
 
 
 namespace Toon {
diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp
index 1187d0542c..5598e8e10c 100644
--- a/engines/toon/script.cpp
+++ b/engines/toon/script.cpp
@@ -29,8 +29,8 @@
 #include "common/util.h"
 #include "common/system.h"
 
-#include "toon.h"
-#include "script.h"
+#include "toon/toon.h"
+#include "toon/script.h"
 
 namespace Toon {
 EMCInterpreter::EMCInterpreter(ToonEngine *vm) : _vm(vm), _scriptData(0), _filename(0) {
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index 8150b4414b..e2842e0e6b 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -23,14 +23,14 @@
 *
 */
 
-#include "script_func.h"
-#include "script.h"
-#include "state.h"
-#include "toon.h"
-#include "anim.h"
-#include "hotspot.h"
-#include "drew.h"
-#include "flux.h"
+#include "toon/script_func.h"
+#include "toon/script.h"
+#include "toon/state.h"
+#include "toon/toon.h"
+#include "toon/anim.h"
+#include "toon/hotspot.h"
+#include "toon/drew.h"
+#include "toon/flux.h"
 
 namespace Toon {
 
diff --git a/engines/toon/script_func.h b/engines/toon/script_func.h
index d44211b6bb..2f8972134c 100644
--- a/engines/toon/script_func.h
+++ b/engines/toon/script_func.h
@@ -27,7 +27,7 @@
 #define SCRIPT_FUNC_H
 
 #include "common/array.h"
-#include "script.h"
+#include "toon/script.h"
 
 namespace Toon {
 
diff --git a/engines/toon/state.cpp b/engines/toon/state.cpp
index ff61be7b94..c7c6582cc6 100644
--- a/engines/toon/state.cpp
+++ b/engines/toon/state.cpp
@@ -23,8 +23,8 @@
 *
 */
 
-#include "state.h"
-#include "toon.h"
+#include "toon/state.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/state.h b/engines/toon/state.h
index abfcc5542c..283e378443 100644
--- a/engines/toon/state.h
+++ b/engines/toon/state.h
@@ -28,7 +28,8 @@
 
 #include "common/file.h"
 #include "common/str.h"
-#include "conversation.h"
+#include "toon/conversation.h"
+
 namespace Toon {
 
 struct Location {
diff --git a/engines/toon/text.cpp b/engines/toon/text.cpp
index d6c06fb649..c18e0cbdc8 100644
--- a/engines/toon/text.cpp
+++ b/engines/toon/text.cpp
@@ -23,7 +23,7 @@
 *
 */
 
-#include "text.h"
+#include "toon/text.h"
 
 namespace Toon {
 
diff --git a/engines/toon/text.h b/engines/toon/text.h
index 28877d1a05..9a35471e4f 100644
--- a/engines/toon/text.h
+++ b/engines/toon/text.h
@@ -26,7 +26,7 @@
 #ifndef TOON_TEXT_H
 #define TOON_TEXT_H
 
-#include "toon.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/tools.cpp b/engines/toon/tools.cpp
index 856fc59eb4..266effe759 100644
--- a/engines/toon/tools.cpp
+++ b/engines/toon/tools.cpp
@@ -23,8 +23,8 @@
 *
 */
 
-#include "tools.h"
-#include "toon.h"
+#include "toon/tools.h"
+#include "toon/toon.h"
 
 namespace Toon {
 
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index dc96be9c34..ca1e9e845d 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -35,14 +35,14 @@
 #include "gui/saveload.h"
 #include "gui/about.h"
 #include "gui/message.h"
-#include "resource.h"
-#include "toon.h"
-#include "anim.h"
-#include "picture.h"
-#include "hotspot.h"
-#include "flux.h"
-#include "drew.h"
-#include "path.h"
+#include "toon/resource.h"
+#include "toon/toon.h"
+#include "toon/anim.h"
+#include "toon/picture.h"
+#include "toon/hotspot.h"
+#include "toon/flux.h"
+#include "toon/drew.h"
+#include "toon/path.h"
 
 namespace Toon {
 
diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index 9a88601e96..9b3adb608e 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -30,16 +30,16 @@
 #include "engines/engine.h"
 #include "graphics/surface.h"
 #include "common/random.h"
-#include "resource.h"
-#include "script.h"
-#include "script_func.h"
-#include "state.h"
-#include "picture.h"
-#include "anim.h"
-#include "movie.h"
-#include "font.h"
-#include "text.h"
-#include "audio.h"
+#include "toon/resource.h"
+#include "toon/script.h"
+#include "toon/script_func.h"
+#include "toon/state.h"
+#include "toon/picture.h"
+#include "toon/anim.h"
+#include "toon/movie.h"
+#include "toon/font.h"
+#include "toon/text.h"
+#include "toon/audio.h"
 
 #define TOON_DAT_VER_MAJ 0  // 1 byte
 #define TOON_DAT_VER_MIN 3  // 1 byte