HOPKINS: Reorder includes

22 files changed, 108 insertions, 73 deletions

diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index bc09d421e4..2186967922 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -20,17 +20,19 @@
  *
  */
 
-#include "common/system.h"
-#include "graphics/palette.h"
-#include "common/file.h"
-#include "common/rect.h"
-#include "engines/util.h"
 #include "hopkins/anim.h"
+
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
 
+#include "common/system.h"
+#include "graphics/palette.h"
+#include "common/file.h"
+#include "common/rect.h"
+#include "engines/util.h"
+
 namespace Hopkins {
 
 AnimationManager::AnimationManager() {
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index 6a4459857e..7d664acee9 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -20,10 +20,8 @@
  *
  */
 
-#include "common/system.h"
-#include "common/file.h"
-#include "common/textconsole.h"
 #include "hopkins/computer.h"
+
 #include "hopkins/font.h"
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
@@ -31,6 +29,10 @@
 #include "hopkins/hopkins.h"
 #include "hopkins/objects.h"
 
+#include "common/system.h"
+#include "common/file.h"
+#include "common/textconsole.h"
+
 namespace Hopkins {
 
 ComputerManager::ComputerManager() {
diff --git a/engines/hopkins/debugger.cpp b/engines/hopkins/debugger.cpp
index c53e9075b6..0abfd1f62e 100644
--- a/engines/hopkins/debugger.cpp
+++ b/engines/hopkins/debugger.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hopkins/debugger.h"
+
 #include "hopkins/globals.h"
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 7711a053b5..a42597415b 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -21,8 +21,9 @@
  *
  */
 
-#include "base/plugins.h"
+#include "hopkins/hopkins.h"
 
+#include "base/plugins.h"
 #include "common/savefile.h"
 #include "common/str-array.h"
 #include "common/memstream.h"
@@ -31,8 +32,6 @@
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
-#include "hopkins/hopkins.h"
-
 #define MAX_SAVES 99
 
 namespace Hopkins {
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index fe5f8cc2a5..574100e9df 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -20,12 +20,8 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/events.h"
-#include "common/file.h"
-#include "common/util.h"
 #include "hopkins/dialogs.h"
+
 #include "hopkins/events.h"
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
@@ -33,6 +29,12 @@
 #include "hopkins/hopkins.h"
 #include "hopkins/sound.h"
 
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/events.h"
+#include "common/file.h"
+#include "common/util.h"
+
 namespace Hopkins {
 
 DialogsManager::DialogsManager() {
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 769696e2a0..f097405394 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -20,15 +20,17 @@
  *
  */
 
-#include "common/system.h"
-#include "common/textconsole.h"
-#include "graphics/cursorman.h"
 #include "hopkins/events.h"
+
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
 #include "hopkins/hopkins.h"
 #include "hopkins/sound.h"
 
+#include "common/system.h"
+#include "common/textconsole.h"
+#include "graphics/cursorman.h"
+
 namespace Hopkins {
 
 EventsManager::EventsManager() {
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index bc4c8d2e56..e0cd1a3995 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -21,8 +21,10 @@
  */
 
 #include "hopkins/files.h"
+
 #include "hopkins/hopkins.h"
 #include "hopkins/globals.h"
+
 #include "common/system.h"
 #include "common/debug.h"
 #include "common/file.h"
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 83237846a2..3343c2fd10 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -20,16 +20,18 @@
  *
  */
 
-#include "common/system.h"
-#include "common/file.h"
-#include "common/textconsole.h"
 #include "hopkins/font.h"
+
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
 #include "hopkins/objects.h"
 
+#include "common/system.h"
+#include "common/file.h"
+#include "common/textconsole.h"
+
 namespace Hopkins {
 
 FontManager::FontManager() {
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 1848e7fdb4..06807b3940 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -20,14 +20,16 @@
  *
  */
 
-#include "common/textconsole.h"
-#include "common/file.h"
 #include "hopkins/globals.h"
+
 #include "hopkins/files.h"
 #include "hopkins/font.h"
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
 
+#include "common/textconsole.h"
+#include "common/file.h"
+
 namespace Hopkins {
 
 // Global null pointer. This is needed by the engine to recognise NULL pointers, since
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index ccdd8adb36..61af620769 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -20,16 +20,18 @@
  *
  */
 
+#include "hopkins/graphics.h"
+
+#include "hopkins/files.h"
+#include "hopkins/globals.h"
+#include "hopkins/hopkins.h"
+
 #include "common/system.h"
 #include "graphics/palette.h"
 #include "graphics/decoders/pcx.h"
 #include "common/file.h"
 #include "common/rect.h"
 #include "engines/util.h"
-#include "hopkins/files.h"
-#include "hopkins/globals.h"
-#include "hopkins/graphics.h"
-#include "hopkins/hopkins.h"
 
 namespace Hopkins {
 
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 90bf6d98b0..ab3fe1fc56 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -20,18 +20,19 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/debug-channels.h"
-#include "common/events.h"
-#include "common/file.h"
-#include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
+#include "hopkins/graphics.h"
 #include "hopkins/files.h"
 #include "hopkins/saveload.h"
 #include "hopkins/sound.h"
 #include "hopkins/talk.h"
 
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug-channels.h"
+#include "common/events.h"
+#include "common/file.h"
+
 namespace Hopkins {
 
 HopkinsEngine *g_vm;
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index e058ce36c0..d3e735df10 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -23,14 +23,6 @@
 #ifndef HOPKINS_HOPKINS_H
 #define HOPKINS_HOPKINS_H
 
-#include "common/scummsys.h"
-#include "common/system.h"
-#include "common/error.h"
-#include "common/random.h"
-#include "common/hash-str.h"
-#include "common/util.h"
-#include "engines/engine.h"
-#include "graphics/surface.h"
 #include "hopkins/anim.h"
 #include "hopkins/computer.h"
 #include "hopkins/debugger.h"
@@ -48,6 +40,15 @@
 #include "hopkins/sound.h"
 #include "hopkins/talk.h"
 
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "common/error.h"
+#include "common/random.h"
+#include "common/hash-str.h"
+#include "common/util.h"
+#include "engines/engine.h"
+#include "graphics/surface.h"
+
 /**
  * This is the namespace of the Hopkins engine.
  *
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index db9ea2f3eb..38c42b8363 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -20,12 +20,14 @@
  *
  */
 
-#include "common/system.h"
-#include "common/textconsole.h"
 #include "hopkins/lines.h"
+
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
 
+#include "common/system.h"
+#include "common/textconsole.h"
+
 namespace Hopkins {
 
 LinesManager::LinesManager() {
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index 798acc2a8e..f8868ddf27 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -20,11 +20,8 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "common/events.h"
-#include "common/file.h"
-#include "common/util.h"
 #include "hopkins/menu.h"
+
 #include "hopkins/dialogs.h"
 #include "hopkins/files.h"
 #include "hopkins/hopkins.h"
@@ -33,6 +30,11 @@
 #include "hopkins/graphics.h"
 #include "hopkins/sound.h"
 
+#include "common/scummsys.h"
+#include "common/events.h"
+#include "common/file.h"
+#include "common/util.h"
+
 namespace Hopkins {
 
 void MenuManager::setParent(HopkinsEngine *vm) {
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index e21eb7f347..bbb2e38ddb 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -20,17 +20,19 @@
  *
  */
 
-#include "common/system.h"
-#include "graphics/palette.h"
-#include "common/file.h"
-#include "common/rect.h"
-#include "engines/util.h"
 #include "hopkins/objects.h"
+
 #include "hopkins/dialogs.h"
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
 #include "hopkins/hopkins.h"
 
+#include "common/system.h"
+#include "graphics/palette.h"
+#include "common/file.h"
+#include "common/rect.h"
+#include "engines/util.h"
+
 namespace Hopkins {
 
 ObjectsManager::ObjectsManager() {
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index a39fe29772..7dc58b0b10 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -23,10 +23,11 @@
 #ifndef HOPKINS_OBJECTS_H
 #define HOPKINS_OBJECTS_H
 
+#include "hopkins/globals.h"
+
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/str.h"
-#include "hopkins/globals.h"
 
 #define MAX_SPRITE 5
 namespace Hopkins {
diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 7f0dd9cd60..ab9ff33b1d 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -20,16 +20,18 @@
  *
  */
 
+#include "hopkins/saveload.h"
+
+#include "hopkins/files.h"
+#include "hopkins/globals.h"
+#include "hopkins/hopkins.h"
+
+
 #include "common/system.h"
 #include "common/savefile.h"
 #include "graphics/surface.h"
 #include "graphics/scaler.h"
 #include "graphics/thumbnail.h"
-#include "hopkins/saveload.h"
-#include "hopkins/files.h"
-#include "hopkins/globals.h"
-#include "hopkins/graphics.h"
-#include "hopkins/hopkins.h"
 
 namespace Hopkins {
 
diff --git a/engines/hopkins/saveload.h b/engines/hopkins/saveload.h
index b4cdf8ed02..2a7806e759 100644
--- a/engines/hopkins/saveload.h
+++ b/engines/hopkins/saveload.h
@@ -23,11 +23,13 @@
 #ifndef HOPKINS_SAVELOAD_H
 #define HOPKINS_SAVELOAD_H
 
+#include "hopkins/globals.h"
+#include "hopkins/graphics.h"
+
 #include "common/scummsys.h"
 #include "common/savefile.h"
 #include "common/serializer.h"
 #include "common/str.h"
-#include "hopkins/globals.h"
 
 namespace Hopkins {
 
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index d4d008bb07..aed99045c4 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -20,11 +20,6 @@
  *
  */
 
-#include "common/system.h"
-#include "graphics/palette.h"
-#include "common/file.h"
-#include "common/rect.h"
-#include "engines/util.h"
 #include "hopkins/objects.h"
 #include "hopkins/dialogs.h"
 #include "hopkins/files.h"
@@ -32,6 +27,12 @@
 #include "hopkins/sound.h"
 #include "hopkins/hopkins.h"
 
+#include "common/system.h"
+#include "graphics/palette.h"
+#include "common/file.h"
+#include "common/rect.h"
+#include "engines/util.h"
+
 namespace Hopkins {
 
 ScriptManager::ScriptManager() {
diff --git a/engines/hopkins/script.h b/engines/hopkins/script.h
index 40b9612627..d29efee01e 100644
--- a/engines/hopkins/script.h
+++ b/engines/hopkins/script.h
@@ -23,10 +23,11 @@
 #ifndef HOPKINS_SCRIPT_H
 #define HOPKINS_SCRIPT_H
 
+#include "hopkins/globals.h"
+
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/str.h"
-#include "hopkins/globals.h"
 
 namespace Hopkins {
 
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 1e9d02a3ae..87943872d4 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -20,14 +20,16 @@
  *
  */
 
+#include "hopkins/sound.h"
+
+#include "hopkins/globals.h"
+#include "hopkins/hopkins.h"
+
 #include "audio/decoders/adpcm_intern.h"
 #include "common/system.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/textconsole.h"
-#include "hopkins/sound.h"
-#include "hopkins/globals.h"
-#include "hopkins/hopkins.h"
 #include "audio/audiostream.h"
 #include "audio/mods/module.h"
 #include "audio/mods/protracker.h"
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 4c19856ad4..61ea1b6438 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -20,17 +20,19 @@
  *
  */
 
-#include "common/system.h"
-#include "common/endian.h"
-#include "common/file.h"
-#include "common/textconsole.h"
 #include "hopkins/talk.h"
+
 #include "hopkins/files.h"
 #include "hopkins/globals.h"
 #include "hopkins/graphics.h"
 #include "hopkins/hopkins.h"
 #include "hopkins/objects.h"
 
+#include "common/system.h"
+#include "common/endian.h"
+#include "common/file.h"
+#include "common/textconsole.h"
+
 namespace Hopkins {
 
 TalkManager::TalkManager() {