From 420d3afdf8cf1a5408f15886fac782267d8bd566 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Wed, 6 Apr 2016 20:11:48 +0100
Subject: [PATCH] fixup! Jit: Remove unnecessary headers

---
 src/core/arm/decoder/arm.cpp     | 1 +
 src/core/arm/decoder/decoder.h   | 2 --
 src/core/arm/decoder/thumb.cpp   | 2 +-
 src/core/arm/jit_x64/common.h    | 2 --
 src/core/arm/jit_x64/cond.cpp    | 1 -
 src/core/arm/jit_x64/reg_alloc.h | 2 --
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/arm/decoder/arm.cpp b/src/core/arm/decoder/arm.cpp
index 4899cf1b1..f95d75cf0 100644
--- a/src/core/arm/decoder/arm.cpp
+++ b/src/core/arm/decoder/arm.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <array>
 #include <cstddef>
 #include <cstring>
 #include <utility>
diff --git a/src/core/arm/decoder/decoder.h b/src/core/arm/decoder/decoder.h
index e3f463ab1..890a943f6 100644
--- a/src/core/arm/decoder/decoder.h
+++ b/src/core/arm/decoder/decoder.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <array>
 #include <functional>
 #include <memory>
 
@@ -12,7 +11,6 @@
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "common/common_funcs.h"
 
 namespace ArmDecoder {
 
diff --git a/src/core/arm/decoder/thumb.cpp b/src/core/arm/decoder/thumb.cpp
index 25bc0b34b..09d8782ab 100644
--- a/src/core/arm/decoder/thumb.cpp
+++ b/src/core/arm/decoder/thumb.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <array>
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
@@ -11,7 +12,6 @@
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
-#include "common/make_unique.h"
 
 #include "core/arm/decoder/decoder.h"
 
diff --git a/src/core/arm/jit_x64/common.h b/src/core/arm/jit_x64/common.h
index e7a25ca4d..97a4db067 100644
--- a/src/core/arm/jit_x64/common.h
+++ b/src/core/arm/jit_x64/common.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <type_traits>
-
 #include "common/common_types.h"
 
 #include "core/arm/decoder/decoder.h"
diff --git a/src/core/arm/jit_x64/cond.cpp b/src/core/arm/jit_x64/cond.cpp
index 2ba0791dc..18ffbc417 100644
--- a/src/core/arm/jit_x64/cond.cpp
+++ b/src/core/arm/jit_x64/cond.cpp
@@ -5,7 +5,6 @@
 #include "common/assert.h"
 
 #include "core/arm/jit_x64/jit_x64.h"
-#include "core/memory.h"
 
 namespace JitX64 {
 
diff --git a/src/core/arm/jit_x64/reg_alloc.h b/src/core/arm/jit_x64/reg_alloc.h
index cbc8134df..c755f1220 100644
--- a/src/core/arm/jit_x64/reg_alloc.h
+++ b/src/core/arm/jit_x64/reg_alloc.h
@@ -7,8 +7,6 @@
 #include <array>
 #include <map>
 
-#include "common/common_types.h"
-#include "common/common_funcs.h"
 #include "common/x64/emitter.h"
 
 #include "core/arm/decoder/decoder.h"