ASYLUM: clean up includes

engines/asylum/asylum.cpp

@@ -20,6 +20,10 @@
  *
  */
 
+#include "common/debug-channels.h"
+
+#include "engines/util.h"
+
 #include "asylum/asylum.h"
 
 #include "asylum/resources/actor.h"
@@ -43,10 +47,6 @@
 
 #include "asylum/respack.h"
 
-#include "common/debug-channels.h"
-
-#include "engines/util.h"
-
 namespace Asylum {
 
 AsylumEngine::AsylumEngine(OSystem *system, const ADGameDescription *gd) : Engine(system), _gameDescription(gd),

engines/asylum/asylum.h

@@ -20,23 +20,22 @@
  *
  */
 
-#ifndef ASYLUM_ENGINE_H
-#define ASYLUM_ENGINE_H
-
-#include "asylum/resources/data.h"
-
-#include "asylum/console.h"
-#include "asylum/eventhandler.h"
-#include "asylum/shared.h"
+#ifndef ASYLUM_ASYLUM_H
+#define ASYLUM_ASYLUM_H
 
 #include "common/random.h"
 #include "common/scummsys.h"
 #include "common/serializer.h"
 #include "common/system.h"
 
-#include "engines/advancedDetector.h"
 #include "engines/engine.h"
 
+#include "asylum/resources/data.h"
+
+#include "asylum/console.h"
+#include "asylum/eventhandler.h"
+#include "asylum/shared.h"
+
 /**
  * This is the namespace of the Asylum engine.
  *
@@ -54,6 +53,9 @@
  * Supported games:
  *  - Sanitarium
  */
+
+struct ADGameDescription;
+
 namespace Asylum {
 
 class Cursor;
@@ -264,4 +266,4 @@ private:
 
 } // namespace Asylum
 
-#endif
+#endif // ASYLUM_ASYLUM_H

engines/asylum/console.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/debug-channels.h"
+
 #include "asylum/console.h"
 
 #include "asylum/puzzles/puzzles.h"
@@ -41,8 +43,6 @@
 #include "asylum/asylum.h"
 #include "asylum/respack.h"
 
-#include "common/debug-channels.h"
-
 namespace Asylum {
 
 extern int g_debugActors;

engines/asylum/console.h

@@ -95,4 +95,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif
+#endif // ASYLUM_CONSOLE_H

engines/asylum/detection.cpp

@@ -22,6 +22,7 @@
 
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
+
 #include "asylum/detection_table.h"
 
 class AsylumMetaEngineDetection : public AdvancedMetaEngineDetection {

engines/asylum/puzzles/board.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_BOARD_H
-#define ASYLUM_BOARD_H
+#ifndef ASYLUM_PUZZLES_BOARD_H
+#define ASYLUM_PUZZLES_BOARD_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -99,4 +99,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_BOARD_H
+#endif // ASYLUM_PUZZLES_BOARD_H

engines/asylum/puzzles/boardkeyhidesto.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_BOARDKEYHIDESTO_H
-#define ASYLUM_BOARDKEYHIDESTO_H
+#ifndef ASYLUM_PUZZLES_BOARDKEYHIDESTO_H
+#define ASYLUM_PUZZLES_BOARDKEYHIDESTO_H
 
 #include "asylum/puzzles/board.h"
 
@@ -45,4 +45,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_BOARDKEYHIDESTO_H
+#endif // ASYLUM_PUZZLES_BOARDKEYHIDESTO_H

engines/asylum/puzzles/boardsalvation.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_BOARDSALVATION_H
-#define ASYLUM_BOARDSALVATION_H
+#ifndef ASYLUM_PUZZLES_BOARDSALVATION_H
+#define ASYLUM_PUZZLES_BOARDSALVATION_H
 
 #include "asylum/puzzles/board.h"
 
@@ -51,4 +51,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_BOARDSALVATION_H
+#endif // ASYLUM_PUZZLES_BOARDSALVATION_H

engines/asylum/puzzles/boardyouth.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_BOARDYOUTH_H
-#define ASYLUM_BOARDYOUTH_H
+#ifndef ASYLUM_PUZZLES_BOARDYOUTH_H
+#define ASYLUM_PUZZLES_BOARDYOUTH_H
 
 #include "asylum/puzzles/board.h"
 
@@ -45,4 +45,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_BOARDYOUTH_H
+#endif // ASYLUM_PUZZLES_BOARDYOUTH_H

engines/asylum/puzzles/clock.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_CLOCK_H
-#define ASYLUM_CLOCK_H
+#ifndef ASYLUM_PUZZLES_CLOCK_H
+#define ASYLUM_PUZZLES_CLOCK_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -62,4 +62,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_CLOCK_H
+#endif // ASYLUM_PUZZLES_CLOCK_H

engines/asylum/puzzles/fisherman.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_FISHERMAN_H
-#define ASYLUM_FISHERMAN_H
+#ifndef ASYLUM_PUZZLES_FISHERMAN_H
+#define ASYLUM_PUZZLES_FISHERMAN_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -63,4 +63,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_FISHERMAN_H
+#endif // ASYLUM_PUZZLES_FISHERMAN_H

engines/asylum/puzzles/hivecontrol.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef ASYLUM_HIVECONTROL_H
-#define ASYLUM_HIVECONTROL_H
-
-#include "asylum/puzzles/puzzle.h"
+#ifndef ASYLUM_PUZZLES_HIVECONTROL_H
+#define ASYLUM_PUZZLES_HIVECONTROL_H
 
 #include "common/hashmap.h"
 
+#include "asylum/puzzles/puzzle.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -120,4 +120,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_HIVECONTROL_H
+#endif // ASYLUM_PUZZLES_HIVECONTROL_H

engines/asylum/puzzles/hivemachine.h

@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef ASYLUM_HIVEMACHINE_H
-#define ASYLUM_HIVEMACHINE_H
-
-#include "asylum/puzzles/puzzle.h"
+#ifndef ASYLUM_PUZZLES_HIVEMACHINE_H
+#define ASYLUM_PUZZLES_HIVEMACHINE_H
 
 #include "common/array.h"
+
+#include "asylum/puzzles/puzzle.h"
 #include "asylum/resources/polygons.h"
 
 namespace Asylum {
@@ -75,4 +75,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_HIVEMACHINE_H
+#endif // ASYLUM_PUZZLES_HIVEMACHINE_H

engines/asylum/puzzles/lock.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_LOCK_H
-#define ASYLUM_LOCK_H
+#ifndef ASYLUM_PUZZLES_LOCK_H
+#define ASYLUM_PUZZLES_LOCK_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -60,4 +60,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_LOCK_H
+#endif // ASYLUM_PUZZLES_LOCK_H

engines/asylum/puzzles/morguedoor.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_MORGUEDOOR_H
-#define ASYLUM_MORGUEDOOR_H
+#ifndef ASYLUM_PUZZLES_MORGUEDOOR_H
+#define ASYLUM_PUZZLES_MORGUEDOOR_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -89,4 +89,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_MORGUEDOOR_H
+#endif // ASYLUM_PUZZLES_MORGUEDOOR_H

engines/asylum/puzzles/pipes.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include <common/math.h>
+
 #include "asylum/puzzles/pipes.h"
 
 #include "asylum/resources/worldstats.h"
@@ -32,8 +34,6 @@
 
 #include "asylum/asylum.h"
 
-#include <common/math.h>
-
 namespace Asylum {
 
 const Common::Point connectorPoints[] = {

engines/asylum/puzzles/pipes.h

@@ -20,10 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_PIPES_H
-#define ASYLUM_PIPES_H
-
-#include "asylum/puzzles/puzzle.h"
+#ifndef ASYLUM_PUZZLES_PIPES_H
+#define ASYLUM_PUZZLES_PIPES_H
 
 #include "common/list.h"
 #include "common/hashmap.h"
@@ -31,6 +29,8 @@
 #include "common/random.h"
 #include "common/str.h"
 
+#include "asylum/puzzles/puzzle.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -204,4 +204,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_PIPES_H
+#endif // ASYLUM_PUZZLES_PIPES_H

engines/asylum/puzzles/puzzle.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_PUZZLE_H
-#define ASYLUM_PUZZLE_H
-
-#include "asylum/eventhandler.h"
-#include "asylum/shared.h"
+#ifndef ASYLUM_PUZZLES_PUZZLE_H
+#define ASYLUM_PUZZLES_PUZZLE_H
 
 #include "common/rect.h"
 #include "common/serializer.h"
 
+#include "asylum/eventhandler.h"
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -76,4 +76,4 @@ protected:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_PUZZLE_H
+#endif // ASYLUM_PUZZLES_PUZZLE_H

engines/asylum/puzzles/puzzle11.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_PUZZLE11_H
-#define ASYLUM_PUZZLE11_H
+#ifndef ASYLUM_PUZZLES_PUZZLE11_H
+#define ASYLUM_PUZZLES_PUZZLE11_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -57,4 +57,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_PUZZLE11_H
+#endif // ASYLUM_PUZZLES_PUZZLE11_H

engines/asylum/puzzles/puzzles.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef ASYLUM_PUZZLES_H
-#define ASYLUM_PUZZLES_H
+#ifndef ASYLUM_PUZZLES_PUZZLES_H
+#define ASYLUM_PUZZLES_PUZZLES_H
+
+#include "common/serializer.h"
 
 #include "asylum/console.h"
 #include "asylum/shared.h"
 
-#include "common/serializer.h"
-
 namespace Asylum {
 
 class EventHandler;
@@ -70,4 +70,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_PUZZLES_H
+#endif // ASYLUM_PUZZLES_PUZZLES_H

engines/asylum/puzzles/tictactoe.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_TICTACTOE_H
-#define ASYLUM_TICTACTOE_H
+#ifndef ASYLUM_PUZZLES_TICTACTOE_H
+#define ASYLUM_PUZZLES_TICTACTOE_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -88,4 +88,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_TICTACTOE_H
+#endif // ASYLUM_PUZZLES_TICTACTOE_H

engines/asylum/puzzles/timemachine.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_TIMEMACHINE_H
-#define ASYLUM_TIMEMACHINE_H
+#ifndef ASYLUM_PUZZLES_TIMEMACHINE_H
+#define ASYLUM_PUZZLES_TIMEMACHINE_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -74,4 +74,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_TIMEMACHINE_H
+#endif // ASYLUM_PUZZLES_TIMEMACHINE_H

engines/asylum/puzzles/vcr.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_VCR_H
-#define ASYLUM_VCR_H
+#ifndef ASYLUM_PUZZLES_VCR_H
+#define ASYLUM_PUZZLES_VCR_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -146,4 +146,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif // ASYLUM_VCR_H
+#endif // ASYLUM_PUZZLES_VCR_H

engines/asylum/puzzles/wheel.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_WHEEL_H
-#define ASYLUM_WHEEL_H
+#ifndef ASYLUM_PUZZLES_WHEEL_H
+#define ASYLUM_PUZZLES_WHEEL_H
 
 #include "asylum/puzzles/puzzle.h"
 
@@ -72,4 +72,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_WHEEL_H
+#endif // ASYLUM_PUZZLES_WHEEL_H

engines/asylum/puzzles/writings.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_WRITINGS_H
-#define ASYLUM_WRITINGS_H
+#ifndef ASYLUM_PUZZLES_WRITINGS_H
+#define ASYLUM_PUZZLES_WRITINGS_H
 
 #include "asylum/puzzles/puzzle.h"
 #include "asylum/system/graphics.h"
@@ -52,4 +52,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_WRITINGS_H
+#endif // ASYLUM_PUZZLES_WRITINGS_H

engines/asylum/resources/actor.h

@@ -20,16 +20,16 @@
  *
  */
 
-#ifndef ASYLUM_ACTOR_H
-#define ASYLUM_ACTOR_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_RESOURCES_ACTOR_H
+#define ASYLUM_RESOURCES_ACTOR_H
 
 #include "common/array.h"
 #include "common/rect.h"
 #include "common/serializer.h"
 #include "common/stream.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -641,4 +641,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_RESOURCES_ACTOR_H

engines/asylum/resources/data.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "engines/asylum/resources/data.h"
-
 #include "common/textconsole.h"
 
+#include "engines/asylum/resources/data.h"
+
 namespace Asylum {
 
 SharedData::SharedData() : crowsData(this) {

engines/asylum/resources/data.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef ASYLUM_DATA_H
-#define ASYLUM_DATA_H
-
-#include "engines/asylum/shared.h"
+#ifndef ASYLUM_RESOURCES_DATA_H
+#define ASYLUM_RESOURCES_DATA_H
 
 #include "common/rect.h"
 #include "common/serializer.h"
 
+#include "engines/asylum/shared.h"
+
 namespace Asylum {
 
 //////////////////////////////////////////////////////////////////////////
@@ -279,4 +279,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_DATA_H
+#endif // ASYLUM_RESOURCES_DATA_H

engines/asylum/resources/encounters.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_ENCOUNTERS_H
-#define ASYLUM_ENCOUNTERS_H
-
-#include "asylum/eventhandler.h"
-#include "asylum/shared.h"
+#ifndef ASYLUM_RESOURCES_ENCOUNTERS_H
+#define ASYLUM_RESOURCES_ENCOUNTERS_H
 
 #include "common/array.h"
 #include "common/serializer.h"
 
+#include "asylum/eventhandler.h"
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -336,4 +336,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_RESOURCES_ENCOUNTERS_H

engines/asylum/resources/object.h

@@ -20,17 +20,17 @@
  *
  */
 
-#ifndef ASYLUM_OBJECT_H
-#define ASYLUM_OBJECT_H
-
-#include "asylum/shared.h"
-
-#include "asylum/system/sound.h"
+#ifndef ASYLUM_RESOURCES_OBJECT_H
+#define ASYLUM_RESOURCES_OBJECT_H
 
 #include "common/rect.h"
 #include "common/serializer.h"
 #include "common/stream.h"
 
+#include "asylum/shared.h"
+
+#include "asylum/system/sound.h"
+
 namespace Asylum {
 
 class Actor;
@@ -241,4 +241,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif // ASYLUM_OBJECT_H
+#endif // ASYLUM_RESOURCES_OBJECT_H

engines/asylum/resources/polygons.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_POLYGONS_H
-#define ASYLUM_POLYGONS_H
+#ifndef ASYLUM_RESOURCES_POLYGONS_H
+#define ASYLUM_RESOURCES_POLYGONS_H
 
 #include "common/array.h"
 #include "common/rect.h"
@@ -67,4 +67,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_RESOURCES_POLYGONS_H

engines/asylum/resources/reaction.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_REACTION_H
-#define ASYLUM_REACTION_H
+#ifndef ASYLUM_RESOURCES_REACTION_H
+#define ASYLUM_RESOURCES_REACTION_H
 
 #include "common/scummsys.h"
 
@@ -63,4 +63,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_REACTION_H
+#endif // ASYLUM_RESOURCES_REACTION_H

engines/asylum/resources/script.h

@@ -20,10 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_SCRIPT_H
-#define ASYLUM_SCRIPT_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_RESOURCES_SCRIPT_H
+#define ASYLUM_RESOURCES_SCRIPT_H
 
 #include "common/array.h"
 #include "common/func.h"
@@ -31,6 +29,8 @@
 #include "common/stack.h"
 #include "common/stream.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 #define MAX_ACTION_COMMANDS 161
@@ -454,4 +454,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif // ASYLUM_SCRIPT_H
+#endif // ASYLUM_RESOURCES_SCRIPT_H

engines/asylum/resources/special.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_SPECIAL_H
-#define ASYLUM_SPECIAL_H
-
-#include "asylum/shared.h"
-#include "asylum/asylum.h"
+#ifndef ASYLUM_RESOURCES_SPECIAL_H
+#define ASYLUM_RESOURCES_SPECIAL_H
 
 #include "common/scummsys.h"
 #include "common/rect.h"
 
+#include "asylum/shared.h"
+#include "asylum/asylum.h"
+
 namespace Asylum {
 
 class Object;
@@ -112,4 +112,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_SPECIAL_H
+#endif // ASYLUM_RESOURCES_SPECIAL_H

engines/asylum/resources/worldstats.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_WORLDSTATS_H
-#define ASYLUM_WORLDSTATS_H
-
-#include "asylum/system/sound.h"
+#ifndef ASYLUM_RESOURCES_WORLDSTATS_H
+#define ASYLUM_RESOURCES_WORLDSTATS_H
 
 #include "common/array.h"
 #include "common/rect.h"
 #include "common/serializer.h"
 
+#include "asylum/system/sound.h"
+
 namespace Asylum {
 
 #define ACTORS_MAX_COUNT   50
@@ -162,4 +162,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_RESOURCES_WORLDSTATS_H

engines/asylum/respack.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_RESOURCEPACK_H
-#define ASYLUM_RESOURCEPACK_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_RESPACK_H
+#define ASYLUM_RESPACK_H
 
 #include "common/array.h"
 #include "common/file.h"
 #include "common/hashmap.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class ResourceManager;
@@ -118,4 +118,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_RESPACK_H

engines/asylum/staticres.h

@@ -154,4 +154,4 @@ const uint8 angleTable03[256] = {
 
 } // end of namespace Asylum
 
-#endif /* ASYLUM_STATICRES_H */
+#endif // ASYLUM_STATICRES_H

engines/asylum/system/config.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_CONFIGURATIONMANAGER_H
-#define ASYLUM_CONFIGURATIONMANAGER_H
+#ifndef ASYLUM_SYSTEM_CONFIG_H
+#define ASYLUM_SYSTEM_CONFIG_H
 
 #include "common/array.h"
 #include "common/singleton.h"
@@ -106,4 +106,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif // ASYLUM_CONFIGURATIONMANAGER_H
+#endif // ASYLUM_SYSTEM_CONFIG_H

engines/asylum/system/cursor.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef ASYLUM_CURSOR_H
-#define ASYLUM_CURSOR_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_CURSOR_H
+#define ASYLUM_SYSTEM_CURSOR_H
 
 #include "common/events.h"
 #include "common/rect.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -163,4 +163,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_CURSOR_H

engines/asylum/system/graphics.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_GRAPHICS_H
-#define ASYLUM_GRAPHICS_H
+#ifndef ASYLUM_SYSTEM_GRAPHICS_H
+#define ASYLUM_SYSTEM_GRAPHICS_H
 
-#include "asylum/shared.h"
+#include "common/rect.h"
+#include "common/array.h"
 
 #include "graphics/surface.h"
-#include "common/rect.h"
 
-#include "common/array.h"
+#include "asylum/shared.h"
 
 namespace Asylum {
 
@@ -114,4 +114,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_GRAPHICS_H

engines/asylum/system/savegame.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "asylum/system/savegame.h"
 
 #include "asylum/puzzles/puzzles.h"
@@ -37,8 +39,6 @@
 
 #include "asylum/asylum.h"
 
-#include "common/file.h"
-
 namespace Asylum {
 
 #define SAVEGAME_BUILD 851

engines/asylum/system/savegame.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef ASYLUM_SAVEGAME_H
-#define ASYLUM_SAVEGAME_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_SAVEGAME_H
+#define ASYLUM_SYSTEM_SAVEGAME_H
 
 #include "common/savefile.h"
 #include "common/serializer.h"
 #include "common/util.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 #define SAVEGAME_COUNT 25
@@ -258,4 +258,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_SAVEGAME_H
+#endif // ASYLUM_SYSTEM_SAVEGAME_H

engines/asylum/system/screen.cpp

@@ -20,6 +20,9 @@
  *
  */
 
+#include "common/scummsys.h"
+#include "common/timer.h"
+
 #include "asylum/system/screen.h"
 
 #include "asylum/resources/actor.h"
@@ -33,10 +36,6 @@
 #include "asylum/asylum.h"
 #include "asylum/respack.h"
 
-#include "common/timer.h"
-
-#include <stdarg.h>    // For va_list etc.
-
 namespace Asylum {
 
 int g_debugDrawRects;

engines/asylum/system/screen.h

@@ -20,10 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_SCREEN_H
-#define ASYLUM_SCREEN_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_SCREEN_H
+#define ASYLUM_SYSTEM_SCREEN_H
 
 #include "common/array.h"
 #include "common/rect.h"
@@ -31,6 +29,8 @@
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 #define PALETTE_SIZE 256 * 3
@@ -204,4 +204,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_SCREEN_H

engines/asylum/system/sound.cpp

@@ -20,6 +20,11 @@
  *
  */
 
+#include "common/memstream.h"
+
+#include "audio/audiostream.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/wave.h"
 
 #include "asylum/system/config.h"
 #include "asylum/system/sound.h"
@@ -32,12 +37,6 @@
 #include "asylum/asylum.h"
 #include "asylum/respack.h"
 
-#include "common/memstream.h"
-
-#include "audio/audiostream.h"
-#include "audio/decoders/adpcm.h"
-#include "audio/decoders/wave.h"
-
 namespace Asylum {
 
 Sound::Sound(AsylumEngine *engine, Audio::Mixer *mixer) : _vm(engine), _mixer(mixer), _musicVolume(-10000) {

engines/asylum/system/sound.h

@@ -20,18 +20,18 @@
  *
  */
 
-#ifndef ASYLUM_SOUND_H
-#define ASYLUM_SOUND_H
-
-#include "asylum/system/config.h"
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_SOUND_H
+#define ASYLUM_SYSTEM_SOUND_H
 
 #include "common/array.h"
 #include "common/rect.h"
 
 #include "audio/mixer.h"
 
+#include "asylum/system/config.h"
+
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -337,4 +337,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_SOUND_H

engines/asylum/system/speech.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef ASYLUM_SPEECH_H
-#define ASYLUM_SPEECH_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_SPEECH_H
+#define ASYLUM_SYSTEM_SPEECH_H
 
 #include "common/scummsys.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -177,4 +177,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_SPEECH_H

engines/asylum/system/text.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/rational.h"
+
 #include "asylum/system/text.h"
 
 #include "asylum/system/graphics.h"
@@ -28,8 +30,6 @@
 #include "asylum/asylum.h"
 #include "asylum/respack.h"
 
-#include "common/rational.h"
-
 namespace Asylum {
 
 Text::Text(AsylumEngine *engine) : _vm(engine) {

engines/asylum/system/text.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef ASYLUM_TEXT_H
-#define ASYLUM_TEXT_H
-
-#include "asylum/shared.h"
+#ifndef ASYLUM_SYSTEM_TEXT_H
+#define ASYLUM_SYSTEM_TEXT_H
 
 #include "common/rect.h"
 #include "common/scummsys.h"
 
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -84,4 +84,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_SYSTEM_TEXT_H

engines/asylum/views/menu.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_MENU_H
-#define ASYLUM_MENU_H
+#ifndef ASYLUM_VIEWS_MENU_H
+#define ASYLUM_VIEWS_MENU_H
 
 #include "asylum/eventhandler.h"
 #include "asylum/shared.h"
@@ -239,4 +239,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_VIEWS_MENU_H

engines/asylum/views/scene.h

@@ -20,17 +20,18 @@
  *
  */
 
-#ifndef ASYLUM_SCENE_H
-#define ASYLUM_SCENE_H
-
-#include "asylum/eventhandler.h"
-#include "asylum/shared.h"
+#ifndef ASYLUM_VIEWS_SCENE_H
+#define ASYLUM_VIEWS_SCENE_H
 
 #include "common/array.h"
 #include "common/events.h"
 #include "common/rational.h"
+
 #include "graphics/surface.h"
 
+#include "asylum/eventhandler.h"
+#include "asylum/shared.h"
+
 #define SCENE_FILE_MASK "scn.%03d"
 #define MUSIC_FILE_MASK "mus.%03d"
 
@@ -470,4 +471,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_VIEWS_SCENE_H

engines/asylum/views/scenetitle.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_SCENETITLE_H
-#define ASYLUM_SCENETITLE_H
+#ifndef ASYLUM_VIEWS_SCENETITLE_H
+#define ASYLUM_VIEWS_SCENETITLE_H
 
 #include "common/scummsys.h"
 
@@ -52,4 +52,4 @@ private:
 
 } // End of namespace Asylum
 
-#endif // ASYLUM_SCENETITLE_H
+#endif // ASYLUM_VIEWS_SCENETITLE_H

engines/asylum/views/video.h

@@ -20,11 +20,8 @@
  *
  */
 
-#ifndef ASYLUM_VIDEO_H
-#define ASYLUM_VIDEO_H
-
-#include "asylum/eventhandler.h"
-#include "asylum/shared.h"
+#ifndef ASYLUM_VIEWS_VIDEO_H
+#define ASYLUM_VIEWS_VIDEO_H
 
 #include "common/array.h"
 #include "common/events.h"
@@ -37,6 +34,9 @@
 
 #include "video/smk_decoder.h"
 
+#include "asylum/eventhandler.h"
+#include "asylum/shared.h"
+
 namespace Asylum {
 
 class AsylumEngine;
@@ -106,4 +106,4 @@ private:
 
 } // end of namespace Asylum
 
-#endif
+#endif // ASYLUM_VIEWS_VIDEO_H