From 63645de85b409ad9cbb2656700bab81fe367625f Mon Sep 17 00:00:00 2001
From: TellowKrinkle <tellowkrinkle@gmail.com>
Date: Sun, 20 Jun 2021 22:53:53 -0500
Subject: [PATCH] GS: Don't include xbyak into everything

Xbyak header is massive
---
 pcsx2/GS/GSUtil.h                         | 2 ++
 pcsx2/GS/GS_types.h                       | 3 +--
 pcsx2/GS/Renderers/Common/GSFunctionMap.h | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pcsx2/GS/GSUtil.h b/pcsx2/GS/GSUtil.h
index 64f65d4bb6f03..6820e212840da 100644
--- a/pcsx2/GS/GSUtil.h
+++ b/pcsx2/GS/GSUtil.h
@@ -17,6 +17,8 @@
 
 #include "GS.h"
 
+#include <xbyak/xbyak_util.h>
+
 class GSUtil
 {
 public:
diff --git a/pcsx2/GS/GS_types.h b/pcsx2/GS/GS_types.h
index eec8fea35300e..9cbfad9151e07 100644
--- a/pcsx2/GS/GS_types.h
+++ b/pcsx2/GS/GS_types.h
@@ -25,10 +25,9 @@ typedef unsigned long long uint64;
 typedef signed long long int64;
 typedef signed long long sint64;
 
+// Makes sure that if anyone includes xbyak, it doesn't do anything bad
 #define MIE_INTEGER_TYPE_DEFINED
 #define XBYAK_ENABLE_OMITTED_OPERAND
-#include <xbyak/xbyak.h>
-#include <xbyak/xbyak_util.h>
 
 #include <cfloat>
 
diff --git a/pcsx2/GS/Renderers/Common/GSFunctionMap.h b/pcsx2/GS/Renderers/Common/GSFunctionMap.h
index adb7adf13ccc1..93d9f09f4e841 100644
--- a/pcsx2/GS/Renderers/Common/GSFunctionMap.h
+++ b/pcsx2/GS/Renderers/Common/GSFunctionMap.h
@@ -20,6 +20,8 @@
 
 #include "GS/Renderers/SW/GSScanlineEnvironment.h"
 
+#include <xbyak/xbyak_util.h>
+
 template <class KEY, class VALUE>
 class GSFunctionMap
 {