NEVERHOOD: Move module files to own subdirectory

engines/neverhood/detection.cpp

@@ -235,4 +235,3 @@ SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target,
 #else
 	REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine);
 #endif
-

engines/neverhood/gamemodule.cpp

@@ -24,27 +24,27 @@
 
 #include "neverhood/graphics.h"
 #include "neverhood/menumodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1300.h"
-#include "neverhood/module1400.h"
-#include "neverhood/module1500.h"
-#include "neverhood/module1600.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module1800.h"
-#include "neverhood/module1900.h"
-#include "neverhood/module2000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
-#include "neverhood/module2300.h"
-#include "neverhood/module2400.h"
-#include "neverhood/module2500.h"
-#include "neverhood/module2600.h"
-#include "neverhood/module2700.h"
-#include "neverhood/module2800.h"
-#include "neverhood/module2900.h"
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module1500.h"
+#include "neverhood/modules/module1600.h"
+#include "neverhood/modules/module1700.h"
+#include "neverhood/modules/module1800.h"
+#include "neverhood/modules/module1900.h"
+#include "neverhood/modules/module2000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module2300.h"
+#include "neverhood/modules/module2400.h"
+#include "neverhood/modules/module2500.h"
+#include "neverhood/modules/module2600.h"
+#include "neverhood/modules/module2700.h"
+#include "neverhood/modules/module2800.h"
+#include "neverhood/modules/module2900.h"
+#include "neverhood/modules/module3000.h"
 
 namespace Neverhood {
 

engines/neverhood/module.cpp

@@ -23,8 +23,8 @@
 #include "neverhood/module.h"
 #include "neverhood/navigationscene.h"
 #include "neverhood/smackerscene.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1500.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1500.h"
 
 namespace Neverhood {
 

engines/neverhood/module.mk

@@ -13,27 +13,27 @@ MODULE_OBJS = \
 	menumodule.o \
 	microtiles.o \
 	module.o \
-	module1000.o \
-	module1100.o \
-	module1200.o \
-	module1300.o \
-	module1400.o \
-	module1500.o \
-	module1600.o \
-	module1700.o \
-	module1800.o \
-	module1900.o \
-	module2000.o \
-	module2100.o \
-	module2200.o \
-	module2300.o \
-	module2400.o \
-	module2500.o \
-	module2600.o \
-	module2700.o \
-	module2800.o \
-	module2900.o \
-	module3000.o \
+	modules/module1000.o \
+	modules/module1100.o \
+	modules/module1200.o \
+	modules/module1300.o \
+	modules/module1400.o \
+	modules/module1500.o \
+	modules/module1600.o \
+	modules/module1700.o \
+	modules/module1800.o \
+	modules/module1900.o \
+	modules/module2000.o \
+	modules/module2100.o \
+	modules/module2200.o \
+	modules/module2300.o \
+	modules/module2400.o \
+	modules/module2500.o \
+	modules/module2600.o \
+	modules/module2700.o \
+	modules/module2800.o \
+	modules/module2900.o \
+	modules/module3000.o \
 	mouse.o \
 	navigationscene.o \
 	neverhood.o \

engines/neverhood/modules/module1000.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module1000.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1000_H
-#define NEVERHOOD_MODULE1000_H
+#ifndef NEVERHOOD_MODULES_MODULE1000_H
+#define NEVERHOOD_MODULES_MODULE1000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -297,4 +297,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1000_H */
+#endif /* NEVERHOOD_MODULES_MODULE1000_H */

engines/neverhood/modules/module1100.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1100.h"
+#include "neverhood/modules/module1100.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 

engines/neverhood/modules/module1100.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1100_H
-#define NEVERHOOD_MODULE1100_H
+#ifndef NEVERHOOD_MODULES_MODULE1100_H
+#define NEVERHOOD_MODULES_MODULE1100_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -127,4 +127,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1100_H */
+#endif /* NEVERHOOD_MODULES_MODULE1100_H */

engines/neverhood/modules/module1200.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module1200.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1200_H
-#define NEVERHOOD_MODULE1200_H
+#ifndef NEVERHOOD_MODULES_MODULE1200_H
+#define NEVERHOOD_MODULES_MODULE1200_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -213,4 +213,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1200_H */
+#endif /* NEVERHOOD_MODULES_MODULE1200_H */

engines/neverhood/modules/module1300.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "neverhood/module1300.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1400.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module2200.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/diskplayerscene.h"
 #include "neverhood/menumodule.h"

engines/neverhood/modules/module1300.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1300_H
-#define NEVERHOOD_MODULE1300_H
+#ifndef NEVERHOOD_MODULES_MODULE1300_H
+#define NEVERHOOD_MODULES_MODULE1300_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -292,4 +292,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1300_H */
+#endif /* NEVERHOOD_MODULES_MODULE1300_H */

engines/neverhood/modules/module1400.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/module1400.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
 #include "neverhood/diskplayerscene.h"
 #include "neverhood/gamemodule.h"
 

engines/neverhood/modules/module1400.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1400_H
-#define NEVERHOOD_MODULE1400_H
+#ifndef NEVERHOOD_MODULES_MODULE1400_H
+#define NEVERHOOD_MODULES_MODULE1400_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -278,4 +278,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1400_H */
+#endif /* NEVERHOOD_MODULES_MODULE1400_H */

engines/neverhood/modules/module1500.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1500.h"
+#include "neverhood/modules/module1500.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module1500.h

@@ -22,8 +22,8 @@
 
 // TODO: I couldn't come up with a better name than 'Module' so far
 
-#ifndef NEVERHOOD_MODULE1500_H
-#define NEVERHOOD_MODULE1500_H
+#ifndef NEVERHOOD_MODULES_MODULE1500_H
+#define NEVERHOOD_MODULES_MODULE1500_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -55,4 +55,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1500_H */
+#endif /* NEVERHOOD_MODULES_MODULE1500_H */

engines/neverhood/modules/module1600.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module1600.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module2200.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module1600.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1600_H
-#define NEVERHOOD_MODULE1600_H
+#ifndef NEVERHOOD_MODULES_MODULE1600_H
+#define NEVERHOOD_MODULES_MODULE1600_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module3000.h"
 
 namespace Neverhood {
 
@@ -180,4 +180,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1600_H */
+#endif /* NEVERHOOD_MODULES_MODULE1600_H */

engines/neverhood/modules/module1700.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1700.h"
+#include "neverhood/modules/module1700.h"
 #include "neverhood/gamemodule.h"
 
 namespace Neverhood {

engines/neverhood/modules/module1700.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1700_H
-#define NEVERHOOD_MODULE1700_H
+#ifndef NEVERHOOD_MODULES_MODULE1700_H
+#define NEVERHOOD_MODULES_MODULE1700_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -69,4 +69,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1700_H */
+#endif /* NEVERHOOD_MODULES_MODULE1700_H */

engines/neverhood/modules/module1800.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1800.h"
+#include "neverhood/modules/module1800.h"
 #include "neverhood/navigationscene.h"
 #include "neverhood/menumodule.h"
 

engines/neverhood/modules/module1800.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1800_H
-#define NEVERHOOD_MODULE1800_H
+#ifndef NEVERHOOD_MODULES_MODULE1800_H
+#define NEVERHOOD_MODULES_MODULE1800_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -43,4 +43,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1800_H */
+#endif /* NEVERHOOD_MODULES_MODULE1800_H */

engines/neverhood/modules/module1900.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1900.h"
+#include "neverhood/modules/module1900.h"
 #include "neverhood/gamemodule.h"
 
 namespace Neverhood {

engines/neverhood/modules/module1900.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1900_H
-#define NEVERHOOD_MODULE1900_H
+#ifndef NEVERHOOD_MODULES_MODULE1900_H
+#define NEVERHOOD_MODULES_MODULE1900_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -140,4 +140,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1900_H */
+#endif /* NEVERHOOD_MODULES_MODULE1900_H */

engines/neverhood/modules/module2000.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2000.h"
+#include "neverhood/modules/module2000.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 

engines/neverhood/modules/module2000.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2000_H
-#define NEVERHOOD_MODULE2000_H
+#ifndef NEVERHOOD_MODULES_MODULE2000_H
+#define NEVERHOOD_MODULES_MODULE2000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -52,4 +52,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2000_H */
+#endif /* NEVERHOOD_MODULES_MODULE2000_H */

engines/neverhood/modules/module2100.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2100.h"
+#include "neverhood/modules/module2100.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2100.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2100_H
-#define NEVERHOOD_MODULE2100_H
+#ifndef NEVERHOOD_MODULES_MODULE2100_H
+#define NEVERHOOD_MODULES_MODULE2100_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -89,4 +89,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2100_H */
+#endif /* NEVERHOOD_MODULES_MODULE2100_H */

engines/neverhood/modules/module2200.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2200.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1200.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/diskplayerscene.h"
 

engines/neverhood/modules/module2200.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2200_H
-#define NEVERHOOD_MODULE2200_H
+#ifndef NEVERHOOD_MODULES_MODULE2200_H
+#define NEVERHOOD_MODULES_MODULE2200_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 #include "neverhood/graphics.h"
 
 namespace Neverhood {
@@ -372,4 +372,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2200_H */
+#endif /* NEVERHOOD_MODULES_MODULE2200_H */

engines/neverhood/modules/module2300.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2300.h"
+#include "neverhood/modules/module2300.h"
 #include "neverhood/navigationscene.h"
 
 namespace Neverhood {

engines/neverhood/modules/module2300.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2300_H
-#define NEVERHOOD_MODULE2300_H
+#ifndef NEVERHOOD_MODULES_MODULE2300_H
+#define NEVERHOOD_MODULES_MODULE2300_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -45,4 +45,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2300_H */
+#endif /* NEVERHOOD_MODULES_MODULE2300_H */

engines/neverhood/modules/module2400.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2400.h"
+#include "neverhood/modules/module2400.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2400.h

@@ -20,19 +20,19 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2400_H
-#define NEVERHOOD_MODULE2400_H
+#ifndef NEVERHOOD_MODULES_MODULE2400_H
+#define NEVERHOOD_MODULES_MODULE2400_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module2800.h"
 #include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
@@ -179,4 +179,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2400_H */
+#endif /* NEVERHOOD_MODULES_MODULE2400_H */

engines/neverhood/modules/module2500.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "neverhood/module2500.h"
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module2500.h"
+#include "neverhood/modules/module1600.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2500.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2500_H
-#define NEVERHOOD_MODULE2500_H
+#ifndef NEVERHOOD_MODULES_MODULE2500_H
+#define NEVERHOOD_MODULES_MODULE2500_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1600.h"
-#include "neverhood/module2700.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1600.h"
+#include "neverhood/modules/module2700.h"
 
 namespace Neverhood {
 
@@ -98,4 +98,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2500_H */
+#endif /* NEVERHOOD_MODULES_MODULE2500_H */

engines/neverhood/modules/module2600.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2600.h"
+#include "neverhood/modules/module2600.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2600.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2600_H
-#define NEVERHOOD_MODULE2600_H
+#ifndef NEVERHOOD_MODULES_MODULE2600_H
+#define NEVERHOOD_MODULES_MODULE2600_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -71,4 +71,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2600_H */
+#endif /* NEVERHOOD_MODULES_MODULE2600_H */

engines/neverhood/modules/module2700.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2700.h"
+#include "neverhood/modules/module2700.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2700.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2700_H
-#define NEVERHOOD_MODULE2700_H
+#ifndef NEVERHOOD_MODULES_MODULE2700_H
+#define NEVERHOOD_MODULES_MODULE2700_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module1600.h"
 
 namespace Neverhood {
 
@@ -179,4 +179,4 @@ public:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2700_H */
+#endif /* NEVERHOOD_MODULES_MODULE2700_H */

engines/neverhood/modules/module2800.cpp

@@ -20,12 +20,12 @@
  *
  */
 
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module2800.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module2200.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 {

engines/neverhood/modules/module2800.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2800_H
-#define NEVERHOOD_MODULE2800_H
+#ifndef NEVERHOOD_MODULES_MODULE2800_H
+#define NEVERHOOD_MODULES_MODULE2800_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -502,4 +502,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2800_H */
+#endif /* NEVERHOOD_MODULES_MODULE2800_H */

engines/neverhood/modules/module2900.cpp

@@ -20,14 +20,14 @@
  *
  */
 
-#include "neverhood/module2900.h"
+#include "neverhood/modules/module2900.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1300.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module2000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1700.h"
+#include "neverhood/modules/module2000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2800.h"
 
 namespace Neverhood {
 

engines/neverhood/modules/module2900.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2900_H
-#define NEVERHOOD_MODULE2900_H
+#ifndef NEVERHOOD_MODULES_MODULE2900_H
+#define NEVERHOOD_MODULES_MODULE2900_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -99,4 +99,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2900_H */
+#endif /* NEVERHOOD_MODULES_MODULE2900_H */

engines/neverhood/modules/module3000.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module3000.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 

engines/neverhood/modules/module3000.h

@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE3000_H
-#define NEVERHOOD_MODULE3000_H
+#ifndef NEVERHOOD_MODULES_MODULE3000_H
+#define NEVERHOOD_MODULES_MODULE3000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -252,4 +252,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE3000_H */
+#endif /* NEVERHOOD_MODULES_MODULE3000_H */