From df3f9af6d7f2541b4f0e874097bd82abf7bccb31 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 13 May 2018 15:34:38 -0400
Subject: [PATCH 1/2] NewPatchDialog: Convert PatchEngine include into a
 forward declaration

Avoids needing to include Core headers in UI-related header files,
preventing unintentional propagation.
---
 Source/Core/DolphinQt2/Config/NewPatchDialog.cpp | 2 ++
 Source/Core/DolphinQt2/Config/NewPatchDialog.h   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
index fbe081d0b2..55136d7565 100644
--- a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
+++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
@@ -15,6 +15,8 @@
 #include <QScrollArea>
 #include <QVBoxLayout>
 
+#include "Core/PatchEngine.h"
+
 NewPatchDialog::NewPatchDialog(QWidget* parent, PatchEngine::Patch& patch)
     : QDialog(parent), m_patch(patch)
 {
diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.h b/Source/Core/DolphinQt2/Config/NewPatchDialog.h
index cc62712d9a..2ac8edb630 100644
--- a/Source/Core/DolphinQt2/Config/NewPatchDialog.h
+++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.h
@@ -9,7 +9,10 @@
 #include <QDialog>
 #include <QWidget>
 
-#include "Core/PatchEngine.h"
+namespace PatchEngine
+{
+struct Patch;
+}
 
 class QDialogButtonBox;
 class QGroupBox;

From 799e4154beaf447aaa1dee6838846b9daf9fe7d9 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 13 May 2018 15:38:55 -0400
Subject: [PATCH 2/2] PatchesWidget: Convert Core and UICommon includes into
 forward declarations

Avoids propagating inclusions through UI headers
---
 Source/Core/DolphinQt2/Config/PatchesWidget.cpp |  5 +++++
 Source/Core/DolphinQt2/Config/PatchesWidget.h   | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
index b7c8a4218a..3b5f1d078d 100644
--- a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
@@ -11,9 +11,14 @@
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
+#include "Core/PatchEngine.h"
+
 #include "DolphinQt2/Config/NewPatchDialog.h"
 
+#include "UICommon/GameFile.h"
+
 PatchesWidget::PatchesWidget(const UICommon::GameFile& game)
     : m_game(game), m_game_id(game.GetGameID()), m_game_revision(game.GetRevision())
 {
diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.h b/Source/Core/DolphinQt2/Config/PatchesWidget.h
index f8998f121b..fd68171203 100644
--- a/Source/Core/DolphinQt2/Config/PatchesWidget.h
+++ b/Source/Core/DolphinQt2/Config/PatchesWidget.h
@@ -9,13 +9,22 @@
 
 #include <QWidget>
 
-#include "Core/PatchEngine.h"
-#include "UICommon/GameFile.h"
+#include "Common/CommonTypes.h"
+
+namespace PatchEngine
+{
+struct Patch;
+}
 
 class QListWidget;
 class QListWidgetItem;
 class QPushButton;
 
+namespace UICommon
+{
+class GameFile;
+}
+
 class PatchesWidget : public QWidget
 {
 public: