13 files changed, 52 insertions, 36 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index c3b82b795e..4fea2638f0 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -25,14 +25,15 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/scummsys.h"
+#include "mortevielle/mortevielle.h"
 #include "mortevielle/dialogs.h"
 #include "mortevielle/menu.h"
-#include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/speech.h"
 
+#include "common/scummsys.h"
+
 namespace Mortevielle {
 
 /**
diff --git a/engines/mortevielle/debugger.cpp b/engines/mortevielle/debugger.cpp
index 9c24954f83..042eb0e224 100644
--- a/engines/mortevielle/debugger.cpp
+++ b/engines/mortevielle/debugger.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "mortevielle/debugger.h"
 #include "mortevielle/mortevielle.h"
+#include "mortevielle/debugger.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index d2f9274d25..2c644bc459 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -25,13 +25,15 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/str.h"
-#include "mortevielle/dialogs.h"
 #include "mortevielle/mortevielle.h"
+
+#include "mortevielle/dialogs.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/speech.h"
 
+#include "common/str.h"
+
 namespace Mortevielle {
 
 /**
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 0ac43a65da..1ced3003e2 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -25,12 +25,13 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
+#include "mortevielle/mortevielle.h"
+#include "mortevielle/graphics.h"
+#include "mortevielle/mouse.h"
+
 #include "common/endian.h"
 #include "common/system.h"
 #include "graphics/palette.h"
-#include "mortevielle/graphics.h"
-#include "mortevielle/mortevielle.h"
-#include "mortevielle/mouse.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index c856f0edc2..a28965523a 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -25,14 +25,16 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/scummsys.h"
-#include "common/str.h"
-#include "common/textconsole.h"
-#include "mortevielle/menu.h"
 #include "mortevielle/mortevielle.h"
+
+#include "mortevielle/menu.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 
+#include "common/scummsys.h"
+#include "common/str.h"
+#include "common/textconsole.h"
+
 namespace Mortevielle {
 
 const byte menuConstants[8][4] = {
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 7829fabb5e..418b0a079f 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -25,14 +25,8 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/system.h"
-#include "common/config-manager.h"
-#include "common/debug-channels.h"
-#include "engines/util.h"
-#include "engines/engine.h"
-#include "graphics/palette.h"
-#include "graphics/pixelformat.h"
 #include "mortevielle/mortevielle.h"
+
 #include "mortevielle/dialogs.h"
 #include "mortevielle/menu.h"
 #include "mortevielle/mouse.h"
@@ -40,6 +34,14 @@
 #include "mortevielle/saveload.h"
 #include "mortevielle/outtext.h"
 
+#include "common/system.h"
+#include "common/config-manager.h"
+#include "common/debug-channels.h"
+#include "engines/util.h"
+#include "engines/engine.h"
+#include "graphics/palette.h"
+#include "graphics/pixelformat.h"
+
 namespace Mortevielle {
 
 MortevielleEngine *g_vm;
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 4d3d8bb2ab..139ccbef6c 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -25,10 +25,11 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
+#include "mortevielle/mortevielle.h"
+#include "mortevielle/mouse.h"
+
 #include "common/endian.h"
 #include "common/rect.h"
-#include "mortevielle/mouse.h"
-#include "mortevielle/mortevielle.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index 7778eb3484..81760d1afa 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -25,12 +25,13 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/file.h"
-#include "common/str.h"
+#include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/graphics.h"
-#include "mortevielle/mortevielle.h"
+
+#include "common/file.h"
+#include "common/str.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index 382fd14277..ff3bee5c06 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -25,13 +25,14 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/file.h"
-#include "common/system.h"
-#include "mortevielle/dialogs.h"
 #include "mortevielle/mortevielle.h"
+#include "mortevielle/dialogs.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/saveload.h"
 
+#include "common/file.h"
+#include "common/system.h"
+
 namespace Mortevielle {
 
 static const char SAVEGAME_ID[4] = { 'M', 'O', 'R', 'T' };
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index de5c4feba6..d54ab71e50 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -25,9 +25,10 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/scummsys.h"
-#include "mortevielle/sound.h"
 #include "mortevielle/mortevielle.h"
+#include "mortevielle/sound.h"
+
+#include "common/scummsys.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp
index 1fe130af83..aea49d8df1 100644
--- a/engines/mortevielle/speech.cpp
+++ b/engines/mortevielle/speech.cpp
@@ -25,11 +25,13 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/endian.h"
-#include "common/file.h"
+#include "mortevielle/mortevielle.h"
+
 #include "mortevielle/speech.h"
 #include "mortevielle/sound.h"
-#include "mortevielle/mortevielle.h"
+
+#include "common/endian.h"
+#include "common/file.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/speech.h b/engines/mortevielle/speech.h
index 73f8e16067..7f779a86c3 100644
--- a/engines/mortevielle/speech.h
+++ b/engines/mortevielle/speech.h
@@ -28,9 +28,10 @@
 #ifndef MORTEVIELLE_SPEECH_H
 #define MORTEVIELLE_SPEECH_H
 
-#include "common/scummsys.h"
 #include "mortevielle/sound.h"
 
+#include "common/scummsys.h"
+
 namespace Mortevielle {
 
 const int kAdrNoise  = 0x5cb0;/*2C00;*/
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 6469939f17..ca6bdcdfc6 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -25,16 +25,17 @@
  * Copyright (c) 1987-1989 Lankhor
  */
 
-#include "common/scummsys.h"
-#include "graphics/cursorman.h"
+#include "mortevielle/mortevielle.h"
 
 #include "mortevielle/dialogs.h"
 #include "mortevielle/menu.h"
-#include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/speech.h"
 
+#include "common/scummsys.h"
+#include "graphics/cursorman.h"
+
 namespace Mortevielle {
 
 /**