diff --git a/engines/avalanche/acci.cpp b/engines/avalanche/acci.cpp
index e303d3ba523..3301d474f41 100644
--- a/engines/avalanche/acci.cpp
+++ b/engines/avalanche/acci.cpp
@@ -28,7 +28,6 @@
 /* ACCIDENCE II		The parser. */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/acci.h"
 #include "avalanche/gyro.h"
 #include "avalanche/lucerna.h"
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index c30104f0b61..ed6f92f0063 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -28,7 +28,6 @@
 /* TRIP5	Trippancy V - the sprite animation subsystem */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/animation.h"
 #include "avalanche/scrolls.h"
 #include "avalanche/lucerna.h"
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 739fcd0bb89..cd13cf5824b 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -29,10 +29,8 @@
 #define AVALANCHE_AVALANCHE_H
 
 #include "avalanche/console.h"
-
 #include "avalanche/graphics.h"
 #include "avalanche/parser.h"
-
 #include "avalanche/avalot.h"
 #include "avalanche/gyro.h"
 #include "avalanche/pingo.h"
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index f4d180e68b1..ac961a6d176 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -45,12 +45,8 @@
 #include "common/textconsole.h"
 #include "common/config-manager.h"
 
-
-
 namespace Avalanche {
 
-
-
 Avalot::Avalot(AvalancheEngine *vm) {
 	_vm = vm;
 }
diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index 3437949145e..5f182bcf2fc 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -25,10 +25,9 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
-/* CELER	The unit for updating the screen pics. */
+/* Original name: CELER		The unit for updating the screen pics. */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/background.h"
 #include "avalanche/animation.h"
 #include "avalanche/lucerna.h"
diff --git a/engines/avalanche/background.h b/engines/avalanche/background.h
index 18e47e7d881..915abb9f906 100644
--- a/engines/avalanche/background.h
+++ b/engines/avalanche/background.h
@@ -25,7 +25,7 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
-/* CELER	The unit for updating the screen pics. */
+/* Original name: CELER		The unit for updating the screen pics. */
 
 #ifndef AVALANCHE_CELER2_H
 #define AVALANCHE_CELER2_H
diff --git a/engines/avalanche/closing.cpp b/engines/avalanche/closing.cpp
index 900000d8bce..85d5fe0bb83 100644
--- a/engines/avalanche/closing.cpp
+++ b/engines/avalanche/closing.cpp
@@ -28,7 +28,6 @@
 /* CLOSING		The closing screen and error handler. */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/closing.h"
 #include "avalanche/gyro.h"
 #include "avalanche/lucerna.h"
@@ -36,8 +35,6 @@
 #include "common/textconsole.h"
 #include "common/random.h"
 
-
-
 namespace Avalanche {
 
 Closing::Closing(AvalancheEngine *vm) {
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 6e34a5afb9c..1b243d2845c 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -25,12 +25,14 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
-#include "engines/advancedDetector.h"
+#include "avalanche/avalanche.h"
+
 #include "common/system.h"
 #include "common/savefile.h"
-#include "graphics/thumbnail.h"
 
-#include "avalanche/avalanche.h"
+#include "engines/advancedDetector.h"
+
+#include "graphics/thumbnail.h"
 
 namespace Avalanche {
 
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 806ef3f14c0..97624cf1dee 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -25,8 +25,6 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
-#include "math.h"
-
 #include "avalanche/avalanche.h"
 #include "avalanche/graphics.h"
 
@@ -37,6 +35,8 @@
 
 #include "graphics/palette.h"
 
+#include "math.h"
+
 namespace Avalanche {
 
 const byte Graphics::kEgaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63};
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index 41b1016cb48..7706c5f75e8 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -29,9 +29,9 @@
 #define AVALANCHE_GRAPHICS_H
 
 #include "common/file.h"
+#include "common/rect.h"
 
 #include "graphics/surface.h"
-#include "common/rect.h"
 
 namespace Avalanche {
 class AvalancheEngine;
diff --git a/engines/avalanche/gyro.cpp b/engines/avalanche/gyro.cpp
index c1ea6a25750..9d4aa19d1ca 100644
--- a/engines/avalanche/gyro.cpp
+++ b/engines/avalanche/gyro.cpp
@@ -28,7 +28,6 @@
 /* GYRO		It all revolves around this bit! */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/gyro.h"
 #include "avalanche/pingo.h"
 #include "avalanche/scrolls.h"
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index f62c2506045..659d2008ec8 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -30,15 +30,15 @@
 #ifndef AVALANCHE_GYRO2_H
 #define AVALANCHE_GYRO2_H
 
+#include "avalanche/roomnums.h"
+#include "avalanche/color.h"
+
 #include "common/str.h"
 #include "common/scummsys.h"
 #include "common/file.h"
 
 #include "graphics/surface.h"
 
-#include "avalanche/roomnums.h"
-#include "avalanche/color.h"
-
 namespace Avalanche {
 class AvalancheEngine;
 
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 4143a43ca13..3b30739cff5 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -28,7 +28,6 @@
 /* LUCERNA		The screen, [keyboard] and mouse handler.*/
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/lucerna.h"
 #include "avalanche/gyro.h"
 #include "avalanche/scrolls.h"
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index 2d899dad78d..3e67a667e90 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -25,7 +25,7 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
- /* DROPDOWN	A customised version of Oopmenu (qv). */
+/* Original name: DROPDOWN		A customised version of Oopmenu (qv). */
 
 #include "avalanche/avalanche.h"
 #include "avalanche/menu.h"
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index ad0821e9322..9a00a2821f1 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -25,12 +25,13 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
-/* DROPDOWN	A customised version of Oopmenu (qv). */
+/* Original name: DROPDOWN		A customised version of Oopmenu (qv). */
 
 #ifndef AVALANCHE_DROPDOWN2_H
 #define AVALANCHE_DROPDOWN2_H
 
 #include "avalanche/color.h"
+
 #include "common/scummsys.h"
 #include "common/str.h"
 
diff --git a/engines/avalanche/sequence.cpp b/engines/avalanche/sequence.cpp
index c3940cdc6df..cb6bd06e6cd 100644
--- a/engines/avalanche/sequence.cpp
+++ b/engines/avalanche/sequence.cpp
@@ -28,7 +28,6 @@
 /* SEQUENCE		The sequencer. */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/sequence.h"
 #include "avalanche/gyro.h"
 #include "avalanche/timer.h"
diff --git a/engines/avalanche/sound.cpp b/engines/avalanche/sound.cpp
index 7ab94c772c6..dba679e17b1 100644
--- a/engines/avalanche/sound.cpp
+++ b/engines/avalanche/sound.cpp
@@ -20,13 +20,14 @@
  *
  */
 
-#include "common/system.h"
-#include "common/config-manager.h"
 #include "audio/audiostream.h"
 
 #include "avalanche/avalanche.h"
 #include "avalanche/sound.h"
 
+#include "common/system.h"
+#include "common/config-manager.h"
+
 namespace Avalanche {
 
 SoundHandler::SoundHandler(AvalancheEngine *vm) : _vm(vm) {
diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp
index 59161e38200..b473e773bdf 100644
--- a/engines/avalanche/timer.cpp
+++ b/engines/avalanche/timer.cpp
@@ -28,7 +28,6 @@
 /* Original name: TIMEOUT	The scheduling unit. */
 
 #include "avalanche/avalanche.h"
-
 #include "avalanche/timer.h"
 #include "avalanche/lucerna.h"
 #include "avalanche/animation.h"