NEVERHOOD: Clean up some includes

24 files changed, 19 insertions, 49 deletions

diff --git a/engines/neverhood/modules/module1100.cpp b/engines/neverhood/modules/module1100.cpp
index 1b226de456..af2df2e742 100644
--- a/engines/neverhood/modules/module1100.cpp
+++ b/engines/neverhood/modules/module1100.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/modules/module1100.h"
-#include "neverhood/modules/module1100_sprites.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1100_sprites.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1300.cpp b/engines/neverhood/modules/module1300.cpp
index 656af29a99..312fb85ae7 100644
--- a/engines/neverhood/modules/module1300.cpp
+++ b/engines/neverhood/modules/module1300.cpp
@@ -20,17 +20,15 @@
  *
  */
 
+#include "neverhood/diskplayerscene.h"
+#include "neverhood/gamemodule.h"
+#include "neverhood/menumodule.h"
 #include "neverhood/modules/module1000_sprites.h"
 #include "neverhood/modules/module1200_sprites.h"
 #include "neverhood/modules/module1300.h"
 #include "neverhood/modules/module1300_sprites.h"
 #include "neverhood/modules/module1400_sprites.h"
 #include "neverhood/modules/module2200_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/diskplayerscene.h"
-#include "neverhood/menumodule.h"
-#include "neverhood/navigationscene.h"
-#include "neverhood/smackerscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1400_sprites.cpp b/engines/neverhood/modules/module1400_sprites.cpp
index aba9bc8c28..413b666103 100644
--- a/engines/neverhood/modules/module1400_sprites.cpp
+++ b/engines/neverhood/modules/module1400_sprites.cpp
@@ -22,7 +22,6 @@
 
 #include "neverhood/modules/module1400_sprites.h"
 #include "neverhood/modules/module1400.h"
-#include "neverhood/gamemodule.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1600_sprites.cpp b/engines/neverhood/modules/module1600_sprites.cpp
index b12a070b0a..4473a83ec9 100644
--- a/engines/neverhood/modules/module1600_sprites.cpp
+++ b/engines/neverhood/modules/module1600_sprites.cpp
@@ -20,11 +20,7 @@
  *
  */
 
-#include "neverhood/gamemodule.h"
-#include "neverhood/modules/module1200.h"
 #include "neverhood/modules/module1600_sprites.h"
-#include "neverhood/modules/module2200_sprites.h"
-#include "neverhood/modules/module3000_sprites.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1700.cpp b/engines/neverhood/modules/module1700.cpp
index 4681e59026..e3a5fc3663 100644
--- a/engines/neverhood/modules/module1700.cpp
+++ b/engines/neverhood/modules/module1700.cpp
@@ -20,9 +20,9 @@
  *
  */
 
+#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1700.h"
 #include "neverhood/modules/module1700_sprites.h"
-#include "neverhood/gamemodule.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1700_sprites.cpp b/engines/neverhood/modules/module1700_sprites.cpp
index 1a8dda3a99..87c8397cf4 100644
--- a/engines/neverhood/modules/module1700_sprites.cpp
+++ b/engines/neverhood/modules/module1700_sprites.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1700_sprites.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/modules/module1800.cpp b/engines/neverhood/modules/module1800.cpp
index b312678467..282292a516 100644
--- a/engines/neverhood/modules/module1800.cpp
+++ b/engines/neverhood/modules/module1800.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "neverhood/modules/module1800.h"
-#include "neverhood/navigationscene.h"
+#include "neverhood/diskplayerscene.h"
 #include "neverhood/menumodule.h"
+#include "neverhood/navigationscene.h"
+#include "neverhood/modules/module1800.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module1900.cpp b/engines/neverhood/modules/module1900.cpp
index 3538c14cf8..a920893755 100644
--- a/engines/neverhood/modules/module1900.cpp
+++ b/engines/neverhood/modules/module1900.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1900.h"
 #include "neverhood/modules/module1900_sprites.h"
 
diff --git a/engines/neverhood/modules/module1900_sprites.cpp b/engines/neverhood/modules/module1900_sprites.cpp
index d7e4898e3b..176731aa3d 100644
--- a/engines/neverhood/modules/module1900_sprites.cpp
+++ b/engines/neverhood/modules/module1900_sprites.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1900.h"
 #include "neverhood/modules/module1900_sprites.h"
 
diff --git a/engines/neverhood/modules/module2000.cpp b/engines/neverhood/modules/module2000.cpp
index fcccdefbdd..e5f0b3fa42 100644
--- a/engines/neverhood/modules/module2000.cpp
+++ b/engines/neverhood/modules/module2000.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "neverhood/modules/module2000.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/navigationscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2100.cpp b/engines/neverhood/modules/module2100.cpp
index 275659dcaf..db7258b066 100644
--- a/engines/neverhood/modules/module2100.cpp
+++ b/engines/neverhood/modules/module2100.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1200_sprites.h"
 #include "neverhood/modules/module2100.h"
 #include "neverhood/modules/module2100_sprites.h"
diff --git a/engines/neverhood/modules/module2100_sprites.cpp b/engines/neverhood/modules/module2100_sprites.cpp
index dbc866e203..0dd904c24d 100644
--- a/engines/neverhood/modules/module2100_sprites.cpp
+++ b/engines/neverhood/modules/module2100_sprites.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "neverhood/modules/module2100_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2200.cpp b/engines/neverhood/modules/module2200.cpp
index e6969cc20d..745af42f72 100644
--- a/engines/neverhood/modules/module2200.cpp
+++ b/engines/neverhood/modules/module2200.cpp
@@ -20,12 +20,12 @@
  *
  */
 
+#include "neverhood/diskplayerscene.h"
+#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1000_sprites.h"
 #include "neverhood/modules/module1200_sprites.h"
 #include "neverhood/modules/module2200.h"
 #include "neverhood/modules/module2200_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2200_sprites.cpp b/engines/neverhood/modules/module2200_sprites.cpp
index fecca35089..5a641068a3 100644
--- a/engines/neverhood/modules/module2200_sprites.cpp
+++ b/engines/neverhood/modules/module2200_sprites.cpp
@@ -21,10 +21,6 @@
  */
 
 #include "neverhood/modules/module2200_sprites.h"
-#include "neverhood/modules/module1000.h"
-#include "neverhood/modules/module1200.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2300.cpp b/engines/neverhood/modules/module2300.cpp
index 2a46df1ee2..689d53570f 100644
--- a/engines/neverhood/modules/module2300.cpp
+++ b/engines/neverhood/modules/module2300.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "neverhood/modules/module2300.h"
 #include "neverhood/navigationscene.h"
+#include "neverhood/modules/module2300.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2500.cpp b/engines/neverhood/modules/module2500.cpp
index bda85e54d2..d0e60adf65 100644
--- a/engines/neverhood/modules/module2500.cpp
+++ b/engines/neverhood/modules/module2500.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "neverhood/modules/module1600.h"
+#include "neverhood/modules/module1600.h"	// for Scene1608
 #include "neverhood/modules/module1600_sprites.h"
 #include "neverhood/modules/module2500.h"
 #include "neverhood/modules/module2500_sprites.h"
-#include "neverhood/modules/module2700.h"
+#include "neverhood/modules/module2700.h"	// for Scene2704
 #include "neverhood/modules/module2700_sprites.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/modules/module2700.cpp b/engines/neverhood/modules/module2700.cpp
index d05f142f77..1b78615fdb 100644
--- a/engines/neverhood/modules/module2700.cpp
+++ b/engines/neverhood/modules/module2700.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "neverhood/gamemodule.h"
-#include "neverhood/modules/module1000.h"
 #include "neverhood/modules/module1600_sprites.h"
 #include "neverhood/modules/module2700.h"
 #include "neverhood/modules/module2700_sprites.h"
diff --git a/engines/neverhood/modules/module2700_sprites.cpp b/engines/neverhood/modules/module2700_sprites.cpp
index abafcfff66..fe0dd60aee 100644
--- a/engines/neverhood/modules/module2700_sprites.cpp
+++ b/engines/neverhood/modules/module2700_sprites.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "neverhood/modules/module2700_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/modules/module1000.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index 49acf475b8..0578a5df2e 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -20,14 +20,15 @@
  *
  */
 
-#include "neverhood/modules/module2800.h"
+#include "neverhood/diskplayerscene.h"
 #include "neverhood/gamemodule.h"
+#include "neverhood/scene.h"
 #include "neverhood/modules/module1000_sprites.h"
 #include "neverhood/modules/module1200_sprites.h"
 #include "neverhood/modules/module1700_sprites.h"
 #include "neverhood/modules/module2200_sprites.h"
+#include "neverhood/modules/module2800.h"
 #include "neverhood/modules/module2800_sprites.h"
-#include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2800_sprites.cpp b/engines/neverhood/modules/module2800_sprites.cpp
index f7949b97c8..c7f4268042 100644
--- a/engines/neverhood/modules/module2800_sprites.cpp
+++ b/engines/neverhood/modules/module2800_sprites.cpp
@@ -22,12 +22,6 @@
 
 #include "neverhood/modules/module2800.h"
 #include "neverhood/modules/module2800_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/modules/module1000.h"
-#include "neverhood/modules/module1200.h"
-#include "neverhood/modules/module1700.h"
-#include "neverhood/modules/module2200.h"
-#include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module2900.cpp b/engines/neverhood/modules/module2900.cpp
index 032f09638b..bb0b69f35d 100644
--- a/engines/neverhood/modules/module2900.cpp
+++ b/engines/neverhood/modules/module2900.cpp
@@ -22,7 +22,6 @@
 
 #include "neverhood/modules/module2900.h"
 #include "neverhood/modules/module2900_sprites.h"
-#include "neverhood/gamemodule.h"
 #include "neverhood/modules/module1100.h"
 #include "neverhood/modules/module1300.h"
 #include "neverhood/modules/module1700.h"
diff --git a/engines/neverhood/modules/module2900_sprites.cpp b/engines/neverhood/modules/module2900_sprites.cpp
index 33b7715da8..59780b33a0 100644
--- a/engines/neverhood/modules/module2900_sprites.cpp
+++ b/engines/neverhood/modules/module2900_sprites.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "neverhood/modules/module2900_sprites.h"
-#include "neverhood/gamemodule.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module3000.cpp b/engines/neverhood/modules/module3000.cpp
index e17e9d43d1..a12776611e 100644
--- a/engines/neverhood/modules/module3000.cpp
+++ b/engines/neverhood/modules/module3000.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/modules/module3000.h"
-#include "neverhood/modules/module3000_sprites.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
+#include "neverhood/modules/module3000.h"
+#include "neverhood/modules/module3000_sprites.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/modules/module3000_sprites.cpp b/engines/neverhood/modules/module3000_sprites.cpp
index 420bd5e632..7d0162d7d0 100644
--- a/engines/neverhood/modules/module3000_sprites.cpp
+++ b/engines/neverhood/modules/module3000_sprites.cpp
@@ -22,8 +22,6 @@
 
 #include "neverhood/modules/module3000.h"
 #include "neverhood/modules/module3000_sprites.h"
-#include "neverhood/gamemodule.h"
-#include "neverhood/navigationscene.h"
 
 namespace Neverhood {