From 097b049aeadef79a68f8d95df564dc709b7e8e3e Mon Sep 17 00:00:00 2001
From: Ankush Dutt <ankushd100@gmail.com>
Date: Mon, 7 Aug 2023 17:54:10 +0530
Subject: [PATCH] DLC: Use forward declaration where appropriate

---
 backends/dlc/dlcmanager.cpp   |  4 +++-
 backends/dlc/dlcmanager.h     | 12 +++++++++---
 backends/dlc/scummvmcloud.cpp |  1 +
 backends/dlc/scummvmcloud.h   |  5 ++++-
 gui/dlcsdialog.cpp            |  2 ++
 gui/dlcsdialog.h              |  6 ++++--
 gui/downloaddlcsdialog.cpp    |  1 +
 gui/downloaddlcsdialog.h      |  7 ++++++-
 8 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/backends/dlc/dlcmanager.cpp b/backends/dlc/dlcmanager.cpp
index ef5b40a03ff..0d9566132ac 100644
--- a/backends/dlc/dlcmanager.cpp
+++ b/backends/dlc/dlcmanager.cpp
@@ -21,12 +21,14 @@
 
 #include "common/system.h"
 
-#include "backends/dlc/android/playstore.h"
 #include "backends/dlc/dlcmanager.h"
+#include "backends/dlc/dlcdesc.h"
+#include "backends/dlc/android/playstore.h"
 #include "backends/dlc/scummvmcloud.h"
 #include "backends/dlc/android/playstore.h"
 
 #include "gui/dlcsdialog.h"
+#include "gui/launcher.h"
 
 namespace Common {
 
diff --git a/backends/dlc/dlcmanager.h b/backends/dlc/dlcmanager.h
index 7b4fde5bf93..2633fe3d37b 100644
--- a/backends/dlc/dlcmanager.h
+++ b/backends/dlc/dlcmanager.h
@@ -28,12 +28,18 @@
 #include "common/singleton.h"
 
 #include "gui/object.h"
-#include "gui/launcher.h"
 
-#include "backends/dlc/store.h"
-#include "backends/dlc/dlcdesc.h"
 #include "backends/networking/curl/request.h"
 
+namespace GUI {
+class LauncherDialog;
+}
+
+namespace DLC {
+class Store;
+struct DLCDesc;
+}
+
 namespace DLC {
 
 class DLCManager : public Common::Singleton<DLCManager>, public GUI::CommandSender {
diff --git a/backends/dlc/scummvmcloud.cpp b/backends/dlc/scummvmcloud.cpp
index ca50c197bed..d01da75a4a6 100644
--- a/backends/dlc/scummvmcloud.cpp
+++ b/backends/dlc/scummvmcloud.cpp
@@ -34,6 +34,7 @@
 
 #include "gui/gui-manager.h"
 
+#include "backends/networking/curl/sessionrequest.h"
 #include "backends/dlc/scummvmcloud.h"
 #include "backends/dlc/dlcmanager.h"
 
diff --git a/backends/dlc/scummvmcloud.h b/backends/dlc/scummvmcloud.h
index a38f7e0a25f..80dd997b44e 100644
--- a/backends/dlc/scummvmcloud.h
+++ b/backends/dlc/scummvmcloud.h
@@ -26,10 +26,13 @@
 
 #include "backends/dlc/store.h"
 #include "backends/dlc/dlcdesc.h"
-#include "backends/networking/curl/session.h"
 #include "backends/networking/curl/request.h"
 #include "backends/networking/curl/curljsonrequest.h"
 
+namespace Networking {
+class SessionRequest;
+}
+
 namespace DLC {
 namespace ScummVMCloud {
 
diff --git a/gui/dlcsdialog.cpp b/gui/dlcsdialog.cpp
index c171083ceb0..bbd30e7aebb 100644
--- a/gui/dlcsdialog.cpp
+++ b/gui/dlcsdialog.cpp
@@ -26,9 +26,11 @@
 #include "gui/widget.h"
 #include "gui/widgets/list.h"
 #include "gui/gui-manager.h"
+#include "gui/launcher.h"
 #include "gui/downloaddlcsdialog.h"
 
 #include "backends/dlc/dlcmanager.h"
+#include "backends/dlc/dlcdesc.h"
 
 namespace GUI {
 
diff --git a/gui/dlcsdialog.h b/gui/dlcsdialog.h
index b8b6d269d0d..ee6ab52839a 100644
--- a/gui/dlcsdialog.h
+++ b/gui/dlcsdialog.h
@@ -23,8 +23,6 @@
 #define GUI_DLCSDIALOG_H
 
 #include "gui/dialog.h"
-#include "gui/widgets/list.h"
-#include "gui/launcher.h"
 
 namespace GUI {
 
@@ -34,6 +32,10 @@ enum {
 	kAllDownloadsCmd = 'ALLD'
 };
 
+class CommandSender;
+class ListWidget;
+class ButtonWidget;
+
 class DLCsDialog : public Dialog {
 public:
 	DLCsDialog();
diff --git a/gui/downloaddlcsdialog.cpp b/gui/downloaddlcsdialog.cpp
index 75e3d0c1dd2..d7ee14025a7 100644
--- a/gui/downloaddlcsdialog.cpp
+++ b/gui/downloaddlcsdialog.cpp
@@ -24,6 +24,7 @@
 #include "gui/downloaddlcsdialog.h"
 #include "gui/widget.h"
 #include "gui/gui-manager.h"
+#include "gui/widgets/list.h"
 
 #include "backends/dlc/dlcmanager.h"
 #include "backends/dlc/dlcdesc.h"
diff --git a/gui/downloaddlcsdialog.h b/gui/downloaddlcsdialog.h
index a1585503d69..dfe95aabe3c 100644
--- a/gui/downloaddlcsdialog.h
+++ b/gui/downloaddlcsdialog.h
@@ -23,10 +23,15 @@
 #define GUI_DOWNLOADDLCSDIALOG_H
 
 #include "gui/dialog.h"
-#include "gui/widgets/list.h"
 
 namespace GUI {
 
+class CommandSender;
+class StaticTextWidget;
+class SliderWidget;
+class ListWidget;
+class ButtonWidget;
+
 class DownloadDLCsDialog : public Dialog {
 public:
 	DownloadDLCsDialog();