[Scummvm-git-logs] scummvm master -> d57fd20ebafe28a8506bed5ea05022e5156c7dc8

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d57fd20eba PLUMBERS: Clean up includes


Commit: d57fd20ebafe28a8506bed5ea05022e5156c7dc8
    https://github.com/scummvm/scummvm/commit/d57fd20ebafe28a8506bed5ea05022e5156c7dc8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-02-02T09:55:38+01:00

Commit Message:
PLUMBERS: Clean up includes

Changed paths:
    engines/plumbers/console.cpp
    engines/plumbers/console.h
    engines/plumbers/detection.cpp
    engines/plumbers/plumbers.cpp
    engines/plumbers/plumbers.h


diff --git a/engines/plumbers/console.cpp b/engines/plumbers/console.cpp
index 730a74e..d48c13b 100644
--- a/engines/plumbers/console.cpp
+++ b/engines/plumbers/console.cpp
@@ -20,9 +20,6 @@
  *
  */
 
-#include "gui/debugger.h"
-
-#include "plumbers/plumbers.h"
 #include "plumbers/console.h"
 
 namespace Plumbers {
diff --git a/engines/plumbers/console.h b/engines/plumbers/console.h
index cb50834..6434ab6 100644
--- a/engines/plumbers/console.h
+++ b/engines/plumbers/console.h
@@ -27,8 +27,6 @@
 
 namespace Plumbers {
 
-class PlumbersGame;
-
 class Console : public GUI::Debugger {
 public:
 	bool _allowSkip;
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 37c6368..57cd439 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -20,13 +20,11 @@
  *
  */
 
+#include "plumbers/plumbers.h"
+
 #include "base/plugins.h"
 
 #include "engines/advancedDetector.h"
-#include "common/file.h"
-
-#include "plumbers/plumbers.h"
-
 
 namespace Plumbers {
 const char *PlumbersGame::getGameId() const { return _gameDescription->gameId; }
diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index d6ef691..a6d4944 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -20,22 +20,29 @@
  *
  */
 
-#include "common/scummsys.h"
+#include "plumbers/plumbers.h"
+#include "plumbers/console.h"
+
+#include "audio/decoders/wave.h"
+#include "audio/audiostream.h"
 
-#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/debug-channels.h"
 #include "common/error.h"
+#include "common/events.h"
+#include "common/file.h"
+#include "common/system.h"
+#include "common/timer.h"
+
+#include "engines/util.h"
+
 #include "graphics/cursorman.h"
-#include "graphics/surface.h"
-#include "graphics/screen.h"
-#include "graphics/palette.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
-#include "common/system.h"
-#include "engines/util.h"
-#include "common/debug.h"
-#include "common/debug-channels.h"
+#include "graphics/palette.h"
+#include "graphics/surface.h"
 
-#include "plumbers/plumbers.h"
+#include "image/bmp.h"
 
 namespace Plumbers {
 
diff --git a/engines/plumbers/plumbers.h b/engines/plumbers/plumbers.h
index 430c696..4473cff 100644
--- a/engines/plumbers/plumbers.h
+++ b/engines/plumbers/plumbers.h
@@ -23,29 +23,25 @@
 #ifndef PLUMBERS_PLUMBERS_H
 #define PLUMBERS_PLUMBERS_H
 
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/error.h"
 #include "engines/engine.h"
 
-#include "audio/audiostream.h"
-#include "audio/decoders/wave.h"
-#include "audio/mixer.h"
-#include "common/events.h"
-#include "common/file.h"
+#include "common/platform.h"
 #include "common/queue.h"
-#include "common/system.h"
-#include "common/timer.h"
-#include "graphics/palette.h"
-#include "graphics/screen.h"
-#include "graphics/surface.h"
-#include "image/bmp.h"
+#include "common/rect.h"
+#include "common/str.h"
 
-#include "plumbers/console.h"
+#include "audio/mixer.h"
 
 struct ADGameDescription;
 
+namespace Image {
+class ImageDecoder;
+}
+
 namespace Plumbers {
+
+class Console;
+
 enum PlumbersDebugChannels {
 	kDebugGeneral = 1 << 0
 };