From 61ff11c26695e355279e931aaa98106f92210dc6 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 8 Jun 2018 18:46:52 -0400
Subject: [PATCH] DSPDisassembler: Remove unnecessary includes

Gets rid of an inclusion dependency with the DSP interpreter, as well as
a header-based dependency on the DSP opcode tables. This also uncovered
an indirect inclusion on the logger within DSPSymbols.cpp
---
 Source/Core/Core/DSP/DSPDisassembler.cpp  | 5 +----
 Source/Core/Core/DSP/DSPDisassembler.h    | 5 ++---
 Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp | 5 +----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp
index 8b6c030fe0..16021149ed 100644
--- a/Source/Core/Core/DSP/DSPDisassembler.cpp
+++ b/Source/Core/Core/DSP/DSPDisassembler.cpp
@@ -6,17 +6,14 @@
 #include "Core/DSP/DSPDisassembler.h"
 
 #include <algorithm>
-#include <cstdlib>
+#include <limits>
 #include <string>
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
-#include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 
 #include "Core/DSP/DSPTables.h"
-#include "Core/DSP/Interpreter/DSPInterpreter.h"
 
 namespace DSP
 {
diff --git a/Source/Core/Core/DSP/DSPDisassembler.h b/Source/Core/Core/DSP/DSPDisassembler.h
index e02e221d9b..8683fee999 100644
--- a/Source/Core/Core/DSP/DSPDisassembler.h
+++ b/Source/Core/Core/DSP/DSPDisassembler.h
@@ -5,16 +5,15 @@
 
 #pragma once
 
-#include <map>
 #include <string>
 #include <vector>
 
 #include "Common/CommonTypes.h"
 
-#include "Core/DSP/DSPTables.h"
-
 namespace DSP
 {
+struct DSPOPCTemplate;
+
 struct AssemblerSettings
 {
   bool print_tabs = false;
diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
index 911e61f9cd..04e3bd5dcf 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
@@ -4,15 +4,12 @@
 
 #include "Core/HW/DSPLLE/DSPSymbols.h"
 
-#include <cctype>
-#include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
-#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPDisassembler.h"