SLUDGE: remove CommonCode directory to have a flat structure

15 files changed, 12 insertions, 13 deletions

diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 6340ad0f44..e2ebb1f16d 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -2614,7 +2614,7 @@ builtIn(doBackgroundEffect) {
 
 } // End of namespace Sludge
 
-#include "CommonCode/functionlist.h"
+#include "functionlist.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index a019f82f57..f0731fe893 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -27,7 +27,7 @@
 #include "sludge/moreio.h"
 #include "sludge/newfatal.h"
 #include "sludge/sludge.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/CommonCode/functionlist.h b/engines/sludge/functionlist.h
index 025f80a844..025f80a844 100644
--- a/engines/sludge/CommonCode/functionlist.h
+++ b/engines/sludge/functionlist.h
diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp
index 3c7cdbf38c..4a6d9b89a3 100644
--- a/engines/sludge/graphics.cpp
+++ b/engines/sludge/graphics.cpp
@@ -28,7 +28,6 @@
 #include "sludge/zbuffer.h"
 #include "sludge/backdrop.h"
 #include "sludge/movie.h"
-#include "sludge/CommonCode/specialsettings.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp
index 06f2a0842f..c1917ad61c 100644
--- a/engines/sludge/language.cpp
+++ b/engines/sludge/language.cpp
@@ -27,7 +27,7 @@
 #include "sludge/moreio.h"
 #include "sludge/language.h"
 #include "sludge/sludge.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 04455bfe32..eb2cc61c90 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -45,7 +45,7 @@
 #include "sludge/bg_effects.h"
 #include "sludge/thumbnail.h"
 #include "sludge/utf8.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index d888059481..3676a3bcdb 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -46,7 +46,7 @@
 #include "sludge/graphics.h"
 #include "sludge/helpers.h"
 #include "sludge/sludge.h"
-#include "sludge/CommonCode/specialsettings.h"
+#include "sludge/specialsettings.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp
index 06defc4620..c569fb4284 100644
--- a/engines/sludge/movie.cpp
+++ b/engines/sludge/movie.cpp
@@ -35,7 +35,7 @@
 #include "AL/alure.h"
 #endif
 
-#include "sludge/CommonCode/specialsettings.h"
+#include "sludge/specialsettings.h"
 
 #include "sludge/newfatal.h"
 #include "sludge/timing.h"
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index 0f847bdda8..6501f82a64 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -27,7 +27,7 @@
 #include "sludge/errors.h"
 #include "sludge/graphics.h"
 #include "sludge/sludge.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index bb9d707ad5..e0fae1b19d 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -26,7 +26,7 @@
 #include "sludge/newfatal.h"
 #include "sludge/moreio.h"
 #include "sludge/fileset.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index 45e7263671..afc34cb792 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -35,7 +35,7 @@
 #include "sludge/floor.h"
 #include "sludge/zbuffer.h"
 #include "sludge/sound.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 #define ANGLEFIX (180.0 / 3.14157)
 #define ANI_STAND 0
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 620d50dbd6..6f502f3359 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -48,8 +48,8 @@
 #include "sludge/graphics.h"
 #include "sludge/variable.h"
 #include "sludge/sludge.h"
-#include "sludge/CommonCode/specialsettings.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/specialsettings.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/CommonCode/specialsettings.h b/engines/sludge/specialsettings.h
index 0aa4786c7a..0aa4786c7a 100644
--- a/engines/sludge/CommonCode/specialsettings.h
+++ b/engines/sludge/specialsettings.h
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index 8044ee645f..eb026b7b6b 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -27,7 +27,7 @@
 #include "sludge/backdrop.h"
 #include "sludge/graphics.h"
 #include "sludge/newfatal.h"
-#include "sludge/CommonCode/version.h"
+#include "sludge/version.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/CommonCode/version.h b/engines/sludge/version.h
index f984b0e56a..f984b0e56a 100644
--- a/engines/sludge/CommonCode/version.h
+++ b/engines/sludge/version.h