49 files changed, 423 insertions, 434 deletions
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index 24185930a9..d80a8aeec6 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -20,32 +20,25 @@
  *
  */
 
-#include "allfiles.h"
-#include "debug.h"
-#include "newfatal.h"
-#include "colours.h"
-#include "fileset.h"
-#include "cursors.h"
-#include "backdrop.h"
-#include "language.h"
-#include "moreio.h"
-#include "variable.h"
-#include "zbuffer.h"
-#include "graphics.h"
-#include "line.h"
-#include "people.h"
-#include "talk.h"
-#include "sludger.h"
-#include "statusba.h"
-#include "variable.h"
-#include "CommonCode/version.h"
 #include "common/debug.h"
+#include "common/rect.h"
 #include "image/png.h"
 #include "graphics/surface.h"
 #include "graphics/palette.h"
-#include "sludge.h"
-#include "imgloader.h"
-#include "common/rect.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
+#include "sludge/colours.h"
+#include "sludge/fileset.h"
+#include "sludge/backdrop.h"
+#include "sludge/moreio.h"
+#include "sludge/zbuffer.h"
+#include "sludge/graphics.h"
+#include "sludge/line.h"
+#include "sludge/sludge.h"
+#include "sludge/sludger.h"
+#include "sludge/variable.h"
+#include "sludge/imgloader.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/backdrop.h b/engines/sludge/backdrop.h
index 01f21b09bd..a381389339 100644
--- a/engines/sludge/backdrop.h
+++ b/engines/sludge/backdrop.h
@@ -23,8 +23,8 @@
 #ifndef SLUDGE_BACKDROP_H
 #define SLUDGE_BACKDROP_H
 
-#include "variable.h"
-#include "graphics.h"
+#include "sludge/graphics.h"
+#include "sludge/variable.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/bg_effects.cpp b/engines/sludge/bg_effects.cpp
index 3692026452..100b9062d3 100644
--- a/engines/sludge/bg_effects.cpp
+++ b/engines/sludge/bg_effects.cpp
@@ -20,17 +20,17 @@
  *
  */
 
-#include "allfiles.h"
-#include "backdrop.h"
-#include "colours.h"
-#include "debug.h"
-#include "graphics.h"
-#include "newfatal.h"
-#include "moreio.h"
-
 #include "common/debug.h"
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
+#include "sludge/colours.h"
+#include "sludge/debug.h"
+#include "sludge/graphics.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+
 namespace Sludge {
 
 #if 0
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 58926b20d6..9733689c20 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -24,37 +24,37 @@
 #include <SDL/SDL.h>
 #endif
 
-#include "debug.h"
-#include "allfiles.h"
-#include "sludger.h"
-#include "builtin.h"
-#include "stringy.h"
-#include "newfatal.h"
-#include "cursors.h"
-#include "statusba.h"
-#include "loadsave.h"
-#include "backdrop.h"
-#include "bg_effects.h"
-#include "sprites.h"
-#include "fonttext.h"
-#include "sprbanks.h"
-#include "people.h"
-#include "sound.h"
-#include "objtypes.h"
-#include "floor.h"
-#include "zbuffer.h"
-#include "talk.h"
-#include "region.h"
-#include "language.h"
-#include "moreio.h"
-#include "movie.h"
-#include "savedata.h"
-#include "freeze.h"
-#include "colours.h"
-#include "language.h"
-#include "thumbnail.h"
-#include "graphics.h"
-#include "CommonCode/utf8.h"
+#include "sludge/debug.h"
+#include "sludge/allfiles.h"
+#include "sludge/sludger.h"
+#include "sludge/builtin.h"
+#include "sludge/stringy.h"
+#include "sludge/newfatal.h"
+#include "sludge/cursors.h"
+#include "sludge/statusba.h"
+#include "sludge/loadsave.h"
+#include "sludge/backdrop.h"
+#include "sludge/bg_effects.h"
+#include "sludge/sprites.h"
+#include "sludge/fonttext.h"
+#include "sludge/sprbanks.h"
+#include "sludge/people.h"
+#include "sludge/sound.h"
+#include "sludge/objtypes.h"
+#include "sludge/floor.h"
+#include "sludge/zbuffer.h"
+#include "sludge/talk.h"
+#include "sludge/region.h"
+#include "sludge/language.h"
+#include "sludge/moreio.h"
+#include "sludge/movie.h"
+#include "sludge/savedata.h"
+#include "sludge/freeze.h"
+#include "sludge/colours.h"
+#include "sludge/language.h"
+#include "sludge/thumbnail.h"
+#include "sludge/graphics.h"
+#include "sludge/CommonCode/utf8.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/cursors.cpp b/engines/sludge/cursors.cpp
index 562f3869c2..4720677bfe 100644
--- a/engines/sludge/cursors.cpp
+++ b/engines/sludge/cursors.cpp
@@ -28,13 +28,13 @@
 #endif
 #endif
 
-#include "allfiles.h"
-#include "cursors.h"
-#include "colours.h"
-#include "sprites.h"
-#include "sprbanks.h"
-#include "people.h"
-#include "sludger.h"
+#include "sludge/allfiles.h"
+#include "sludge/cursors.h"
+#include "sludge/colours.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
+#include "sludge/people.h"
+#include "sludge/sludger.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/debug.cpp b/engines/sludge/debug.cpp
index 3e256bd2ab..e79571a834 100644
--- a/engines/sludge/debug.cpp
+++ b/engines/sludge/debug.cpp
@@ -24,9 +24,9 @@
 #include <stdarg.h>
 #endif
 
-#include "allfiles.h"
-#include "debug.h"
-#include "language.h"
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/language.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index cf858149ef..2c4216d4de 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -27,16 +27,16 @@
 #include <iconv.h>
 #endif
 
-#include "debug.h"
-#include "stringy.h"
-#include "allfiles.h"
-#include "moreio.h"
-#include "newfatal.h"
-#include "CommonCode/version.h"
-
 #include "common/file.h"
 #include "common/debug.h"
-#include "sludge.h"
+
+#include "sludge/debug.h"
+#include "sludge/stringy.h"
+#include "sludge/allfiles.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/sludge.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index 29038b3125..a402ef9ef2 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -19,12 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "newfatal.h"
-#include "fileset.h"
-#include "moreio.h"
-#include "floor.h"
-#include "line.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
+#include "sludge/fileset.h"
+#include "sludge/moreio.h"
+#include "sludge/floor.h"
+#include "sludge/line.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 4dfdd1093e..bf7de8b4e5 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -19,22 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "platform-dependent.h"
 
-#include <stdint.h>
-#include <string.h>
-
-#include "CommonCode/utf8.h"
-
-#include "debug.h"
-#include "allfiles.h"
-#include "stringy.h"
-
-#include "sprites.h"
-#include "colours.h"
-#include "fonttext.h"
-#include "newfatal.h"
-#include "moreio.h"
+#include "sludge/debug.h"
+#include "sludge/allfiles.h"
+#include "sludge/stringy.h"
+#include "sludge/sprites.h"
+#include "sludge/colours.h"
+#include "sludge/fonttext.h"
+#include "sludge/newfatal.h"
+#include "sludge/moreio.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/CommonCode/utf8.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp
index d5aa29d9d0..676c06b87f 100644
--- a/engines/sludge/freeze.cpp
+++ b/engines/sludge/freeze.cpp
@@ -19,22 +19,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "debug.h"
-#include "graphics.h"
-#include "newfatal.h"
-#include "sprites.h"
-#include "sprbanks.h"
-#include "people.h"
-#include "sludger.h"
-#include "objtypes.h"
-#include "region.h"
-#include "backdrop.h"
-#include "talk.h"
-#include "fonttext.h"
-#include "statusba.h"
-#include "freeze.h"
-#include "zbuffer.h"
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/graphics.h"
+#include "sludge/newfatal.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
+#include "sludge/people.h"
+#include "sludge/sludger.h"
+#include "sludge/objtypes.h"
+#include "sludge/region.h"
+#include "sludge/backdrop.h"
+#include "sludge/talk.h"
+#include "sludge/fonttext.h"
+#include "sludge/statusba.h"
+#include "sludge/freeze.h"
+#include "sludge/zbuffer.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp
index 7c7c7bec61..e48ad8c2ee 100644
--- a/engines/sludge/graphics.cpp
+++ b/engines/sludge/graphics.cpp
@@ -23,25 +23,7 @@
 #include <stdarg.h>
 
 #include <SDL/SDL.h>
-#endif
-
-#include "allfiles.h"
-#include "debug.h"
-#include "platform-dependent.h"
-#include "CommonCode/specialsettings.h"
-#include "graphics.h"
-#include "language.h"
-#include "newfatal.h"
-#include "sprbanks.h"
-#include "zbuffer.h"
-#include "backdrop.h"
-#include "shaders.h"
-#include "movie.h"
-#include "stringy.h"
-
-#include "language.h" // for settings
 
-#if 0
 #if !defined(HAVE_GLES2)
 #ifdef _WIN32
 #include <GL\glu.h> // handy for gluErrorString
@@ -53,6 +35,20 @@
 #endif
 #endif
 
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/graphics.h"
+#include "sludge/language.h"
+#include "sludge/newfatal.h"
+#include "sludge/sprbanks.h"
+#include "sludge/zbuffer.h"
+#include "sludge/backdrop.h"
+#include "sludge/shaders.h"
+#include "sludge/movie.h"
+#include "sludge/stringy.h"
+#include "sludge/CommonCode/specialsettings.h"
+
 namespace Sludge {
 
 unsigned int winWidth, winHeight;
@@ -857,9 +853,8 @@ void setupOpenGLStuff() {
 	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-#endif
 	setGraphicsWindow(gameSettings.userFullScreen, false);
-
+#endif
 #if !defined(HAVE_GLES2)
 #if 0
 	/* Check for graphics capabilities... */
diff --git a/engines/sludge/graphics.h b/engines/sludge/graphics.h
index ba23d72c46..5d2bb9a098 100644
--- a/engines/sludge/graphics.h
+++ b/engines/sludge/graphics.h
@@ -39,9 +39,9 @@ struct texture {
 #if 0
 	GLubyte *data;
 	GLuint name;
+	double texW, texH;
 #endif
 	Graphics::Surface surface;
-	double texW, texH;
 };
 
 #if 0
diff --git a/engines/sludge/helpers.cpp b/engines/sludge/helpers.cpp
index 60a29af4c6..9cc44ab660 100644
--- a/engines/sludge/helpers.cpp
+++ b/engines/sludge/helpers.cpp
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "helpers.h"
 
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/helpers.h"
+
 namespace Sludge {
 
 bool fileExists(const char *file) {
diff --git a/engines/sludge/hsi.cpp b/engines/sludge/hsi.cpp
index 5281ff7e2c..2ce87d8fda 100644
--- a/engines/sludge/hsi.cpp
+++ b/engines/sludge/hsi.cpp
@@ -25,9 +25,9 @@
 
 #include "graphics/surface.h"
 
-#include "colours.h"
-#include "hsi.h"
-#include "sludge.h"
+#include "sludge/colours.h"
+#include "sludge/hsi.h"
+#include "sludge/sludge.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index f76c7b6baa..8036b4c17d 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -25,11 +25,11 @@
 #include "image/png.h"
 #include "graphics/surface.h"
 
-#include "allfiles.h"
-#include "hsi.h"
-#include "imgloader.h"
-#include "colours.h"
-#include "sludge.h"
+#include "sludge/allfiles.h"
+#include "sludge/hsi.h"
+#include "sludge/imgloader.h"
+#include "sludge/colours.h"
+#include "sludge/sludge.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp
index 8d795a0d48..d06dda3903 100644
--- a/engines/sludge/language.cpp
+++ b/engines/sludge/language.cpp
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "stringy.h"
-#include "newfatal.h"
-#include "moreio.h"
-#include "language.h"
-#include "CommonCode/version.h"
-#include "platform-dependent.h"
-
-#include "sludge.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/stringy.h"
+#include "sludge/newfatal.h"
+#include "sludge/moreio.h"
+#include "sludge/language.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/sludge.h"
+#include "sludge/CommonCode/version.h"
 
 #include "common/debug.h"
 
diff --git a/engines/sludge/language.h b/engines/sludge/language.h
index 93805c2428..033633b7e5 100644
--- a/engines/sludge/language.h
+++ b/engines/sludge/language.h
@@ -22,10 +22,10 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include "allfiles.h"
-
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+
 namespace Sludge {
 
 struct settingsStruct {
diff --git a/engines/sludge/line.cpp b/engines/sludge/line.cpp
index 0067163415..b041884a51 100644
--- a/engines/sludge/line.cpp
+++ b/engines/sludge/line.cpp
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #endif
 
-#include "graphics.h"
-#include "allfiles.h"
+#include "sludge/graphics.h"
+#include "sludge/allfiles.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index ef50b24393..db6afb1f83 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -19,28 +19,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "sprites.h"
-#include "fonttext.h"
-#include "newfatal.h"
-#include "variable.h"
-#include "CommonCode/version.h"
-#include "language.h"
-#include "moreio.h"
-#include "sludger.h"
-#include "people.h"
-#include "talk.h"
-#include "objtypes.h"
-#include "backdrop.h"
-#include "region.h"
-#include "floor.h"
-#include "zbuffer.h"
-#include "cursors.h"
-#include "statusba.h"
-#include "sound.h"
-#include "fileset.h"
-#include "debug.h"
-#include "loadsave.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/sprites.h"
+#include "sludge/fonttext.h"
+#include "sludge/newfatal.h"
+#include "sludge/variable.h"
+#include "sludge/language.h"
+#include "sludge/moreio.h"
+#include "sludge/sludger.h"
+#include "sludge/people.h"
+#include "sludge/talk.h"
+#include "sludge/objtypes.h"
+#include "sludge/backdrop.h"
+#include "sludge/region.h"
+#include "sludge/floor.h"
+#include "sludge/zbuffer.h"
+#include "sludge/cursors.h"
+#include "sludge/statusba.h"
+#include "sludge/sound.h"
+#include "sludge/fileset.h"
+#include "sludge/debug.h"
+#include "sludge/loadsave.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index 14ffed0595..143d84f05d 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -52,30 +52,32 @@
 #include <SDL/SDL_syswm.h>
 #endif
 
-#include "allfiles.h"
-#include "debug.h"
-#include "platform-dependent.h"
-#include "language.h"
-#include "stringy.h"
-#include "sludger.h"
-#include "backdrop.h"
-#include "language.h"
-#include "newfatal.h"
-#include "people.h"
-#include "floor.h"
-#include "objtypes.h"
-#include "talk.h"
-#include "statusba.h"
-#include "transition.h"
-#include "CommonCode/specialsettings.h"
-#include "timing.h"
-#include "sound.h"
-#include "sludger.h"
-#include "graphics.h"
-#include "helpers.h"
-#include "graphics/surface.h"
 #include "common/debug.h"
-#include "sludge.h"
+
+#include "graphics/surface.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/language.h"
+#include "sludge/stringy.h"
+#include "sludge/sludger.h"
+#include "sludge/backdrop.h"
+#include "sludge/language.h"
+#include "sludge/newfatal.h"
+#include "sludge/people.h"
+#include "sludge/floor.h"
+#include "sludge/objtypes.h"
+#include "sludge/talk.h"
+#include "sludge/statusba.h"
+#include "sludge/transition.h"
+#include "sludge/timing.h"
+#include "sludge/sound.h"
+#include "sludge/sludger.h"
+#include "sludge/graphics.h"
+#include "sludge/helpers.h"
+#include "sludge/sludge.h"
+#include "sludge/CommonCode/specialsettings.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/memwatch.cpp b/engines/sludge/memwatch.cpp
index f9148c5408..1a35f532cf 100644
--- a/engines/sludge/memwatch.cpp
+++ b/engines/sludge/memwatch.cpp
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
 
 #include "common/debug.h"
 
+#include "sludge/allfiles.h"
+
 namespace Sludge {
 
 void *allKnownMem[3000];
diff --git a/engines/sludge/moreio.cpp b/engines/sludge/moreio.cpp
index c7e90ff6ee..7dca5a6f2b 100644
--- a/engines/sludge/moreio.cpp
+++ b/engines/sludge/moreio.cpp
@@ -19,16 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "moreio.h"
-#include "newfatal.h"
-#include "stringy.h"
-
-#include "sludge.h"
 
 #include "common/debug.h"
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/stringy.h"
+#include "sludge/sludge.h"
+
 #if defined __unix__ && !(defined __APPLE__)
 #include <endian.h>
 #if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp
index 8aa2ece12c..dc49cc46f8 100644
--- a/engines/sludge/movie.cpp
+++ b/engines/sludge/movie.cpp
@@ -21,31 +21,10 @@
  */
 #if 0
 #include <SDL/SDL.h>
-#endif
-
-#include <math.h>
-
-#include "CommonCode/specialsettings.h"
-
-#include "libwebm/mkvreader.hpp"
-#include "libwebm/mkvparser.hpp"
-
-#if 0
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "vpx/vpx_decoder.h"
 #include "vpx/vp8dx.h"
 #define interface (&vpx_codec_vp8_dx_algo)
-#endif
-
-#include "newfatal.h"
-#include "timing.h"
-#include "graphics.h"
-#include "movie.h"
-#include "shaders.h"
-
-#include "sound.h"
-
-#if 0
 #include "vorbis/codec.h"
 #define OV_EXCLUDE_STATIC_CALLBACKS
 #include "vorbis/vorbisfile.h"
@@ -56,6 +35,17 @@
 #include "AL/alure.h"
 #endif
 
+#include "sludge/CommonCode/specialsettings.h"
+#include "sludge/libwebm/mkvreader.hpp"
+#include "sludge/libwebm/mkvparser.hpp"
+
+#include "sludge/newfatal.h"
+#include "sludge/timing.h"
+#include "sludge/graphics.h"
+#include "sludge/movie.h"
+#include "sludge/shaders.h"
+#include "sludge/sound.h"
+
 namespace Sludge {
 
 extern int specialSettings;
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index a6887d4165..c00476de00 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -26,16 +26,16 @@
 #include <stdlib.h>
 #endif
 
-#include "allfiles.h"
-
 #include "common/debug.h"
-#include "platform-dependent.h"
-#include "CommonCode/version.h"
-#include "sound.h"
-#include "stringy.h"
-#include "errors.h"
-#include "graphics.h"
-#include "sludge.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/sound.h"
+#include "sludge/stringy.h"
+#include "sludge/errors.h"
+#include "sludge/graphics.h"
+#include "sludge/sludge.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/newfatal.h b/engines/sludge/newfatal.h
index a97dca8101..089b053f9a 100644
--- a/engines/sludge/newfatal.h
+++ b/engines/sludge/newfatal.h
@@ -22,7 +22,7 @@
 #ifndef SLUDGE_NEWFATAL_H
 #define SLUDGE_NEWFATAL_H
 
-#include "errors.h"
+#include "sludge/errors.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index a765f3f852..ffd2c83a8b 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -19,13 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "objtypes.h"
-#include "variable.h"
-#include "newfatal.h"
-#include "moreio.h"
-#include "fileset.h"
-#include "CommonCode/version.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/objtypes.h"
+#include "sludge/variable.h"
+#include "sludge/newfatal.h"
+#include "sludge/moreio.h"
+#include "sludge/fileset.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index bb23d6ade4..ebbf7622cf 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -19,26 +19,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include <math.h>
+
 #include <stdlib.h>
 
-#include "CommonCode/version.h"
-#include "sprites.h"
-#include "sprbanks.h"
-#include "sludger.h"
-#include "objtypes.h"
-#include "region.h"
-#include "people.h"
-#include "talk.h"
-#include "newfatal.h"
-#include "variable.h"
-#include "moreio.h"
-#include "loadsave.h"
-#include "floor.h"
-#include "zbuffer.h"
-#include "sound.h"
-#include "debug.h"
+#include "sludge/allfiles.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
+#include "sludge/sludger.h"
+#include "sludge/objtypes.h"
+#include "sludge/region.h"
+#include "sludge/people.h"
+#include "sludge/talk.h"
+#include "sludge/newfatal.h"
+#include "sludge/variable.h"
+#include "sludge/moreio.h"
+#include "sludge/loadsave.h"
+#include "sludge/floor.h"
+#include "sludge/zbuffer.h"
+#include "sludge/sound.h"
+#include "sludge/debug.h"
+#include "sludge/CommonCode/version.h"
 
 #define ANGLEFIX (180.0 / 3.14157)
 #define ANI_STAND 0
diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp
index 9c565a3ce0..c6fa06ec21 100644
--- a/engines/sludge/region.cpp
+++ b/engines/sludge/region.cpp
@@ -19,13 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "objtypes.h"
-#include "region.h"
-#include "newfatal.h"
-#include "sludger.h"
-#include "moreio.h"
-#include "backdrop.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
+#include "sludge/region.h"
+#include "sludge/sludger.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index bb1315299e..f79e7fb5f2 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -21,16 +21,15 @@
  */
 #include <stdint.h>
 #include <unistd.h>
-#include <string.h>
-
-#include "allfiles.h"
-#include "debug.h"
-#include "variable.h"
-#include "newfatal.h"
-#include "moreio.h"
 
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/variable.h"
+#include "sludge/newfatal.h"
+#include "sludge/moreio.h"
+
 #define LOAD_ERROR "Can't load custom data...\n\n"
 
 namespace Sludge {
diff --git a/engines/sludge/shaders.cpp b/engines/sludge/shaders.cpp
index cd95079ff6..69c3f99159 100644
--- a/engines/sludge/shaders.cpp
+++ b/engines/sludge/shaders.cpp
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "debug.h"
-#include "stringy.h"
-#include "shaders.h"
-#include "graphics.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/stringy.h"
+#include "sludge/shaders.h"
+#include "sludge/graphics.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 85775f07cd..725478c8db 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -20,7 +20,6 @@
  *
  */
 #include "common/scummsys.h"
-
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/debug-channels.h"
@@ -29,7 +28,7 @@
 #include "engines/util.h"
 
 #include "sludge/sludge.h"
-#include "main_loop.h"
+#include "sludge/main_loop.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index a018d744b5..3ae7c35aed 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -33,38 +33,39 @@
 #include <iconv.h>
 #endif
 
-#include "allfiles.h"
-#include "platform-dependent.h"
-#include "CommonCode/version.h"
-#include "sludger.h"
-#include "backdrop.h"
-#include "cursors.h"
-#include "colours.h"
-#include "objtypes.h"
-#include "region.h"
-#include "sprites.h"
-#include "sprbanks.h"
-#include "people.h"
-#include "talk.h"
-#include "newfatal.h"
-#include "stringy.h"
-#include "moreio.h"
-#include "statusba.h"
-#include "builtin.h"
-#include "fonttext.h"
-#include "freeze.h"
-#include "floor.h"
-#include "zbuffer.h"
-#include "sound.h"
-#include "loadsave.h"
-#include "fileset.h"
-#include "transition.h"
-#include "language.h"
-#include "CommonCode/specialsettings.h"
-#include "graphics.h"
-#include "variable.h"
 #include "common/debug.h"
-#include "sludge.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/platform-dependent.h"
+#include "sludge/sludger.h"
+#include "sludge/backdrop.h"
+#include "sludge/cursors.h"
+#include "sludge/colours.h"
+#include "sludge/objtypes.h"
+#include "sludge/region.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
+#include "sludge/people.h"
+#include "sludge/talk.h"
+#include "sludge/newfatal.h"
+#include "sludge/stringy.h"
+#include "sludge/moreio.h"
+#include "sludge/statusba.h"
+#include "sludge/builtin.h"
+#include "sludge/fonttext.h"
+#include "sludge/freeze.h"
+#include "sludge/floor.h"
+#include "sludge/zbuffer.h"
+#include "sludge/sound.h"
+#include "sludge/loadsave.h"
+#include "sludge/fileset.h"
+#include "sludge/transition.h"
+#include "sludge/language.h"
+#include "sludge/graphics.h"
+#include "sludge/variable.h"
+#include "sludge/sludge.h"
+#include "sludge/CommonCode/specialsettings.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sludger.h b/engines/sludge/sludger.h
index f5030ef732..591bd13069 100644
--- a/engines/sludge/sludger.h
+++ b/engines/sludge/sludger.h
@@ -24,13 +24,13 @@
 
 #include <stdint.h>
 
-#include "allfiles.h"
-#include "variable.h"
-#include "csludge.h"
-#include "language.h"
-
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/variable.h"
+#include "sludge/csludge.h"
+#include "sludge/language.h"
+
 namespace Sludge {
 
 #ifndef _WIN32
diff --git a/engines/sludge/sound.h b/engines/sludge/sound.h
index 1c5af969e3..ee1321a739 100644
--- a/engines/sludge/sound.h
+++ b/engines/sludge/sound.h
@@ -29,10 +29,10 @@
 #define HWND void *
 #endif
 
-#include "variable.h"
-
 #include "common/file.h"
 
+#include "sludge/variable.h"
+
 namespace Sludge {
 
 // Sound list stuff
diff --git a/engines/sludge/sound_bass.cpp b/engines/sludge/sound_bass.cpp
index b285b968c9..a7e2ec75cb 100644
--- a/engines/sludge/sound_bass.cpp
+++ b/engines/sludge/sound_bass.cpp
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "newfatal.h"
-#include "bass.h"
-#include "sound.h"
-#include "moreio.h"
-#include "fileset.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
+#include "sludge/sound.h"
+#include "sludge/moreio.h"
+#include "sludge/fileset.h"
 
 #define MAX_SAMPLES 8
 #define MAX_MODS 3
diff --git a/engines/sludge/sound_nosound.cpp b/engines/sludge/sound_nosound.cpp
index 2c347e6af4..9e34ff4bd9 100644
--- a/engines/sludge/sound_nosound.cpp
+++ b/engines/sludge/sound_nosound.cpp
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "newfatal.h"
-#include "sound.h"
-#include "moreio.h"
-#include "fileset.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
+#include "sludge/sound.h"
+#include "sludge/moreio.h"
+#include "sludge/fileset.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sound_openal.cpp b/engines/sludge/sound_openal.cpp
index e180bf8e08..ea64acc00f 100644
--- a/engines/sludge/sound_openal.cpp
+++ b/engines/sludge/sound_openal.cpp
@@ -26,15 +26,15 @@
 #include "AL/alure.h"
 #endif
 
-#include "allfiles.h"
-#include "debug.h"
-#include "newfatal.h"
-#include "sound.h"
-#include "moreio.h"
-#include "fileset.h"
-
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/debug.h"
+#include "sludge/newfatal.h"
+#include "sludge/sound.h"
+#include "sludge/moreio.h"
+#include "sludge/fileset.h"
+
 #define MAX_SAMPLES 8
 #define MAX_MODS 3
 #define NUM_BUFS 3
diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp
index 1ae7774716..bc2d0842bd 100644
--- a/engines/sludge/sprbanks.cpp
+++ b/engines/sludge/sprbanks.cpp
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "sprites.h"
-#include "sprbanks.h"
-#include "newfatal.h"
-#include "debug.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
+#include "sludge/newfatal.h"
+#include "sludge/debug.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sprbanks.h b/engines/sludge/sprbanks.h
index 81d1bc7890..ed60be5271 100644
--- a/engines/sludge/sprbanks.h
+++ b/engines/sludge/sprbanks.h
@@ -22,7 +22,7 @@
 #ifndef SLUDGE_SPRBANKS_H
 #define SLUDGE_SPRBANKS_H
 
-#include "sprites.h"
+#include "sludge/sprites.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index 0927644909..1dc661993a 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -22,20 +22,21 @@
 
 #include "graphics/surface.h"
 #include "graphics/transparent_surface.h"
-#include "allfiles.h"
-#include "fileset.h"
-#include "people.h"
-#include "sprites.h"
-#include "moreio.h"
-#include "newfatal.h"
-#include "colours.h"
-#include "backdrop.h"
-#include "sludger.h"
-#include "zbuffer.h"
-#include "debug.h"
-#include "graphics.h"
-#include "imgloader.h"
-#include "shaders.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/fileset.h"
+#include "sludge/people.h"
+#include "sludge/sprites.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/colours.h"
+#include "sludge/backdrop.h"
+#include "sludge/sludger.h"
+#include "sludge/zbuffer.h"
+#include "sludge/debug.h"
+#include "sludge/graphics.h"
+#include "sludge/imgloader.h"
+#include "sludge/shaders.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index 52aeb5da03..4bf665bad8 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -19,18 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-
-#include "backdrop.h"
-#include "colours.h"
-#include "sprites.h"
-#include "fonttext.h"
-#include "moreio.h"
-#include "stringy.h"
-#include "newfatal.h"
-#include "statusba.h"
+
 #include "common/file.h"
 
+#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
+#include "sludge/colours.h"
+#include "sludge/sprites.h"
+#include "sludge/fonttext.h"
+#include "sludge/moreio.h"
+#include "sludge/stringy.h"
+#include "sludge/newfatal.h"
+#include "sludge/statusba.h"
+
 namespace Sludge {
 
 spritePalette verbLinePalette;
diff --git a/engines/sludge/stringy.cpp b/engines/sludge/stringy.cpp
index 5446f571da..484f014ccb 100644
--- a/engines/sludge/stringy.cpp
+++ b/engines/sludge/stringy.cpp
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "newfatal.h"
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
 
 #ifndef SLUDGE_STRINGY_H
 #define SLUDGE_STRINGY_H
diff --git a/engines/sludge/talk.cpp b/engines/sludge/talk.cpp
index 86e2174e0e..59f71aa459 100644
--- a/engines/sludge/talk.cpp
+++ b/engines/sludge/talk.cpp
@@ -19,20 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "backdrop.h"
-#include "sprites.h"
-#include "sludger.h"
-#include "objtypes.h"
-#include "region.h"
-#include "sprbanks.h"
-#include "people.h"
-#include "talk.h"
-#include "sound.h"
-#include "fonttext.h"
-#include "newfatal.h"
-#include "stringy.h"
-#include "moreio.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
+#include "sludge/sprites.h"
+#include "sludge/sludger.h"
+#include "sludge/objtypes.h"
+#include "sludge/region.h"
+#include "sludge/sprbanks.h"
+#include "sludge/people.h"
+#include "sludge/talk.h"
+#include "sludge/sound.h"
+#include "sludge/fonttext.h"
+#include "sludge/newfatal.h"
+#include "sludge/stringy.h"
+#include "sludge/moreio.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/talk.h b/engines/sludge/talk.h
index 39da742062..4f344fb064 100644
--- a/engines/sludge/talk.h
+++ b/engines/sludge/talk.h
@@ -22,7 +22,7 @@
 #ifndef SLUDGE_TALK_H
 #define SLUDGE_TALK_H
 
-#include "sprites.h"
+#include "sludge/sprites.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index 63c7544fff..c163452be9 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -19,15 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "errors.h"
-#include "moreio.h"
-#include "CommonCode/version.h"
-#include "sludger.h"
-#include "colours.h"
-#include "backdrop.h"
-#include "graphics.h"
-#include "newfatal.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/errors.h"
+#include "sludge/moreio.h"
+#include "sludge/sludger.h"
+#include "sludge/colours.h"
+#include "sludge/backdrop.h"
+#include "sludge/graphics.h"
+#include "sludge/newfatal.h"
+#include "sludge/CommonCode/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index 100cc9cc38..373475b749 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -19,12 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
+
 #include <stdint.h>
-#include "allfiles.h"
-#include "colours.h"
-#include "backdrop.h"
-#include "graphics.h"
-#include "newfatal.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/colours.h"
+#include "sludge/backdrop.h"
+#include "sludge/graphics.h"
+#include "sludge/newfatal.h"
 
 #if 0
 extern GLuint snapshotTextureName;
diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp
index 96473cc423..00df66c6d8 100644
--- a/engines/sludge/variable.cpp
+++ b/engines/sludge/variable.cpp
@@ -19,21 +19,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "debug.h"
 
-#include "allfiles.h"
-#include "variable.h"
-#include "newfatal.h"
-#include "stringy.h"
-#include "objtypes.h"
-#include "people.h"
-#include "fileset.h"
+#include <dirent.h>
 
-#include "sludge.h"
 #include "common/debug.h"
 
-#include <dirent.h>
-#include "moreio.h"
+#include "sludge/debug.h"
+#include "sludge/allfiles.h"
+#include "sludge/variable.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/stringy.h"
+#include "sludge/objtypes.h"
+#include "sludge/people.h"
+#include "sludge/fileset.h"
+#include "sludge/sludge.h"
+
 #ifdef _WIN32
 #include "windows.h"
 
diff --git a/engines/sludge/vid.cpp b/engines/sludge/vid.cpp
index 0aab819b92..519b4ca392 100644
--- a/engines/sludge/vid.cpp
+++ b/engines/sludge/vid.cpp
@@ -19,23 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
 
 #ifndef _MSC_VER        // Microsoft compiler?
 #include <unistd.h>     // For unlink
 #else
 #include <io.h>
 #include <stdio.h>
-#endif
-
-#include "newfatal.h"
-#include "stringy.h"
-#if 0
 #include "vfw.h"
 #endif
-#include "sound.h"
-#include "colours.h"
-#include "fileset.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/newfatal.h"
+#include "sludge/stringy.h"
+#include "sludge/sound.h"
+#include "sludge/colours.h"
+#include "sludge/fileset.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 865a62e6a2..a4641caac3 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -19,12 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "allfiles.h"
-#include "zbuffer.h"
-#include "fileset.h"
-#include "moreio.h"
-#include "newfatal.h"
-#include "graphics.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/zbuffer.h"
+#include "sludge/fileset.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/graphics.h"
 
 namespace Sludge {