Merge pull request #5904 from leoetlino/indirect-include

PowerPC: Fix indirect includes for GDBStub
dolphin-emu · Aug 20, 2017 · 5aed9a6 · 5aed9a6
2 parents 08004d4 + e10e42c
commit 5aed9a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp
@@ -4,8 +4,7 @@
 
 // Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
 
-#include <fcntl.h>
-#include <stdarg.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -20,8 +19,14 @@
 #include <sys/un.h>
 #endif
 
+#include "Common/Logging/Log.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
 #include "Core/Host.h"
 #include "Core/PowerPC/GDBStub.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCCache.h"
+#include "Core/PowerPC/PowerPC.h"
 
 #define GDB_BFR_MAX 10000
 #define GDB_MAX_BP 10

diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h
@@ -6,14 +6,7 @@
 
 #pragma once
 
-#include <signal.h>
-
 #include "Common/CommonTypes.h"
-#include "Common/Thread.h"
-
-#include "Core/HW/CPU.h"
-#include "Core/HW/Memmap.h"
-#include "Core/PowerPC/PowerPC.h"
 
 #ifdef _WIN32
 #define SIGTRAP 5