From cde585a29a82794ede28aabd530e9112e0e0928d Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Wed, 29 Jul 2015 11:48:20 +0200
Subject: [PATCH] Include dependency cleanup

---
 Core/HLE/ReplaceTables.cpp                 | 1 +
 Core/HLE/sceKernelInterrupt.cpp            | 2 ++
 GPU/Common/GPUDebugInterface.h             | 1 -
 GPU/Common/SplineCommon.cpp                | 1 +
 GPU/Debugger/Stepping.cpp                  | 1 +
 GPU/GPUInterface.h                         | 4 +++-
 GPU/Null/NullGpu.cpp                       | 4 ++++
 GPU/Null/NullGpu.h                         | 4 +---
 UI/PauseScreen.cpp                         | 1 +
 Windows/GEDebugger/CtrlDisplayListView.cpp | 2 ++
 headless/WindowsHeadlessHost.cpp           | 1 +
 11 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp
index f06e02c728..6fae1c03a8 100644
--- a/Core/HLE/ReplaceTables.cpp
+++ b/Core/HLE/ReplaceTables.cpp
@@ -33,6 +33,7 @@
 
 #include "GPU/Math3D.h"
 #include "GPU/GPUInterface.h"
+#include "GPU/GPUState.h"
 
 #if defined(_M_IX86) || defined(_M_X64)
 #include <emmintrin.h>
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
index 943ef656e4..19f118d72f 100644
--- a/Core/HLE/sceKernelInterrupt.cpp
+++ b/Core/HLE/sceKernelInterrupt.cpp
@@ -32,7 +32,9 @@
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceKernelMutex.h"
+
 #include "GPU/GPUCommon.h"
+#include "GPU/GPUState.h"
 
 void __DisableInterrupts();
 void __EnableInterrupts();
diff --git a/GPU/Common/GPUDebugInterface.h b/GPU/Common/GPUDebugInterface.h
index c2ea00f551..0c7bb2afb6 100644
--- a/GPU/Common/GPUDebugInterface.h
+++ b/GPU/Common/GPUDebugInterface.h
@@ -21,7 +21,6 @@
 #include <string>
 
 #include "GPU/GPUInterface.h"
-#include "GPU/GPUState.h"
 #include "Core/MemMap.h"
 
 struct GPUDebugOp {
diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp
index 4b9cca11c7..b73cc90eb0 100644
--- a/GPU/Common/SplineCommon.cpp
+++ b/GPU/Common/SplineCommon.cpp
@@ -33,6 +33,7 @@
 #include "GPU/Common/SplineCommon.h"
 #include "GPU/Common/DrawEngineCommon.h"
 #include "GPU/ge_constants.h"
+#include "GPU/GPUState.h"
 
 #if defined(_M_SSE)
 #include <emmintrin.h>
diff --git a/GPU/Debugger/Stepping.cpp b/GPU/Debugger/Stepping.cpp
index 8cb077abfd..622e0eae60 100644
--- a/GPU/Debugger/Stepping.cpp
+++ b/GPU/Debugger/Stepping.cpp
@@ -18,6 +18,7 @@
 #include "base/mutex.h"
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/Debugger/Stepping.h"
+#include "GPU/GPUState.h"
 #include "Core/Core.h"
 
 namespace GPUStepping {
diff --git a/GPU/GPUInterface.h b/GPU/GPUInterface.h
index d10c6ceafc..dbcbe8214e 100644
--- a/GPU/GPUInterface.h
+++ b/GPU/GPUInterface.h
@@ -19,11 +19,13 @@
 
 #include <list>
 #include <string>
+#include <vector>
 
-#include "GPU/GPUState.h"
 #include "Core/MemMap.h"
+#include "GPU/ge_constants.h"
 
 struct PspGeListArgs;
+struct GPUgstate;
 class PointerWrap;
 
 enum DisplayListStatus {
diff --git a/GPU/Null/NullGpu.cpp b/GPU/Null/NullGpu.cpp
index 08e3db5ab4..3e361fc080 100644
--- a/GPU/Null/NullGpu.cpp
+++ b/GPU/Null/NullGpu.cpp
@@ -714,3 +714,7 @@ bool NullGPU::PerformMemoryUpload(u32 dest, int size) {
 bool NullGPU::PerformStencilUpload(u32 dest, int size) {
 	return false;
 }
+
+bool NullGPU::FramebufferReallyDirty() {
+	return !(gstate_c.skipDrawReason & SKIPDRAW_SKIPFRAME);
+}
diff --git a/GPU/Null/NullGpu.h b/GPU/Null/NullGpu.h
index 6d68a4fc20..c9e8f493d5 100644
--- a/GPU/Null/NullGpu.h
+++ b/GPU/Null/NullGpu.h
@@ -49,9 +49,7 @@ public:
 		fullInfo = "NULL";
 	}
 
-	bool FramebufferReallyDirty() override {
-		return !(gstate_c.skipDrawReason & SKIPDRAW_SKIPFRAME);
-	}
+	bool FramebufferReallyDirty() override;
 
 protected:
 	void FastRunLoop(DisplayList &list) override;
diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp
index 52ad0d89cf..8a42a20358 100644
--- a/UI/PauseScreen.cpp
+++ b/UI/PauseScreen.cpp
@@ -28,6 +28,7 @@
 #include "Core/ELF/ParamSFO.h"
 
 #include "GPU/GPUCommon.h"
+#include "GPU/GPUState.h"
 
 #include "Core/HLE/sceDisplay.h"
 #include "Core/HLE/sceUmd.h"
diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp
index 5eeafcd08e..366c9bdd10 100644
--- a/Windows/GEDebugger/CtrlDisplayListView.cpp
+++ b/Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -4,6 +4,8 @@
 #include "Windows/Main.h"
 #include "Core/Config.h"
 #include "GPU/Debugger/Breakpoints.h"
+#include "GPU/GPUState.h"
+
 #include <algorithm>
 
 static const int numCPUs = 1;
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 2680765d5e..9fddc19d8a 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/headless/WindowsHeadlessHost.cpp
@@ -25,6 +25,7 @@
 #include "Core/CoreParameter.h"
 #include "Core/System.h"
 #include "GPU/Common/GPUDebugInterface.h"
+#include "GPU/GPUState.h"
 
 #include "base/logging.h"
 #include "gfx_es2/gl_state.h"