AVALANCHE: Push down AD includes

3 files changed, 10 insertions, 10 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 29fb082da0..303fb0cff8 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -57,7 +57,6 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
 	_help = nullptr;
 	_highscore = nullptr;
 
-	_platform = gd->desc.platform;
 	initVariables();
 }
 
@@ -179,10 +178,6 @@ GUI::Debugger *AvalancheEngine::getDebugger() {
 	return _console;
 }
 
-Common::Platform AvalancheEngine::getPlatform() const {
-	return _platform;
-}
-
 bool AvalancheEngine::hasFeature(EngineFeature f) const {
 	return (f == kSupportsSavingDuringRuntime) || (f == kSupportsLoadingDuringRuntime);
 }
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 6eb5e675cc..d50373b07a 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -48,10 +48,10 @@
 #include "avalanche/mainmenu.h"
 #include "avalanche/highscore.h"
 
+#include "common/error.h"
 #include "common/serializer.h"
 
 #include "engines/engine.h"
-#include "engines/advancedDetector.h"
 
 #include "graphics/cursorman.h"
 
@@ -61,9 +61,7 @@ class RandomSource;
 
 namespace Avalanche {
 
-struct AvalancheGameDescription {
-	ADGameDescription desc;
-};
+struct AvalancheGameDescription;
 
 static const int kSavegameVersion = 2;
 
@@ -132,7 +130,6 @@ protected:
 
 private:
 	AvalancheConsole *_console;
-	Common::Platform _platform;
 
 public:
 	// For Thinkabout:
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 64634dc017..7f3d4f88a8 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -35,6 +35,10 @@
 
 namespace Avalanche {
 
+struct AvalancheGameDescription {
+	ADGameDescription desc;
+};
+
 uint32 AvalancheEngine::getFeatures() const {
 	return _gameDescription->desc.flags;
 }
@@ -43,6 +47,10 @@ const char *AvalancheEngine::getGameId() const {
 	return _gameDescription->desc.gameId;
 }
 
+Common::Platform AvalancheEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
 static const PlainGameDescriptor avalancheGames[] = {
 	{"avalanche", "Lord Avalot d'Argent"},
 	{0, 0}