SLUDGE: header formatting

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 {
 

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 {
 

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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... */

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

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) {

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 {
 

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 {
 

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"
 

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 {

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 {
 

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 {
 

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 {
 

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];

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

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;

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 {
 

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 {
 

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 {
 

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

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 {
 

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 {

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 {
 

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 {
 

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 {
 

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

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

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

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 {
 

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

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 {
 

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 {
 

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 {
 

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;

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

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 {
 

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 {
 

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 {
 

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;

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 "sludge.h"
-#include "common/debug.h"
 
 #include <dirent.h>
-#include "moreio.h"
+
+#include "common/debug.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"
 

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 {
 

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 {