Cleanup includes

svn-id: r22225

12 files changed, 22 insertions, 18 deletions

diff --git a/engines/simon/cursor.cpp b/engines/simon/cursor.cpp
index 5271e13d06..46cc7fddb0 100644
--- a/engines/simon/cursor.cpp
+++ b/engines/simon/cursor.cpp
@@ -22,10 +22,10 @@
 
 #include "common/stdafx.h"
 
-#include "simon/simon.h"
-#include "simon/intern.h"
 #include "common/system.h"
 
+#include "simon/simon.h"
+
 namespace Simon {
 
 #ifdef PALMOS_68K
diff --git a/engines/simon/debug.cpp b/engines/simon/debug.cpp
index 49631b817c..fa4fe87386 100644
--- a/engines/simon/debug.cpp
+++ b/engines/simon/debug.cpp
@@ -22,9 +22,10 @@
 
 // Simon debug functions
 #include "common/stdafx.h"
+
+#include "simon/debug.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
-#include "simon/debug.h"
 #include "simon/vga.h"
 
 #include <sys/stat.h>
diff --git a/engines/simon/debugger.cpp b/engines/simon/debugger.cpp
index 7e3d9df156..246f86cd9d 100644
--- a/engines/simon/debugger.cpp
+++ b/engines/simon/debugger.cpp
@@ -21,8 +21,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/debugger.cpp"
+
 #include "simon/debugger.h"
 #include "simon/simon.h"
 
diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index 1685fd35b2..3be6c453b6 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -31,8 +31,6 @@
 #include "common/md5.h"
 
 #include "simon/simon.h"
-#include "simon/intern.h"
-
 
 namespace Simon {
 static DetectedGameList GAME_detectGames(const FSList &fslist);
diff --git a/engines/simon/icons.cpp b/engines/simon/icons.cpp
index dbaf3ff146..887bc35bbb 100644
--- a/engines/simon/icons.cpp
+++ b/engines/simon/icons.cpp
@@ -25,7 +25,6 @@
 #include "common/file.h"
 
 #include "simon/simon.h"
-#include "simon/intern.h"
 
 namespace Simon {
 
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index f00aef3ee9..dc7f733491 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -24,11 +24,10 @@
 
 #include "common/stdafx.h"
 
+#include "common/system.h"
+
 #include "simon/animation.h"
 #include "simon/simon.h"
-#include "simon/intern.h"
-
-#include "common/system.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);
diff --git a/engines/simon/midi.cpp b/engines/simon/midi.cpp
index 4c6a971dcf..f6cbc42741 100644
--- a/engines/simon/midi.cpp
+++ b/engines/simon/midi.cpp
@@ -22,12 +22,14 @@
 
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
-#include "common/system.h"
+
 #include "common/file.h"
-#include "sound/mixer.h"
+#include "common/system.h"
+
 #include "simon/simon.h"
 
+#include "sound/mixer.h"
+
 namespace Simon {
 
 
diff --git a/engines/simon/midiparser_s1d.cpp b/engines/simon/midiparser_s1d.cpp
index 926a8cb263..5576b0e6d5 100644
--- a/engines/simon/midiparser_s1d.cpp
+++ b/engines/simon/midiparser_s1d.cpp
@@ -21,10 +21,12 @@
  */
 
 #include "common/stdafx.h"
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+
 #include "common/util.h"
 
+#include "sound/mididrv.h"
+#include "sound/midiparser.h"
+
 #include <stdio.h>
 
 namespace Simon {
diff --git a/engines/simon/saveload.cpp b/engines/simon/saveload.cpp
index 522d137ff2..bee6255938 100644
--- a/engines/simon/saveload.cpp
+++ b/engines/simon/saveload.cpp
@@ -22,15 +22,15 @@
 
 #include "common/stdafx.h"
 
+#include "common/savefile.h"
+#include "common/system.h"
+
 #include "gui/about.h"
 #include "gui/message.h"
 
 #include "simon/simon.h"
 #include "simon/intern.h"
 
-#include "common/savefile.h"
-#include "common/system.h"
-
 namespace Simon {
 
 int SimonEngine::countSaveGames() {
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 08374f001a..24c94d3ed2 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -24,7 +24,6 @@
 
 #include "backends/fs/fs.h"
 
-
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"
diff --git a/engines/simon/verb.cpp b/engines/simon/verb.cpp
index ca3e63e25b..f2b38f1dfa 100644
--- a/engines/simon/verb.cpp
+++ b/engines/simon/verb.cpp
@@ -22,6 +22,7 @@
 
 // Verb and hitarea handling
 #include "common/stdafx.h"
+
 #include "simon/simon.h"
 #include "simon/intern.h"
 
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index 7dbaa74273..cf18263e35 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -22,6 +22,7 @@
 
 // Video script opcodes for Simon1/Simon2
 #include "common/stdafx.h"
+
 #include "simon/simon.h"
 #include "simon/intern.h"
 #include "simon/vga.h"