Replacing includes of windows headers with base/platform.h.

src/xenia/cpu/backend/x64/x64_backend.cc

@@ -15,7 +15,6 @@
 #include "xenia/cpu/backend/x64/x64_sequences.h"
 #include "xenia/cpu/backend/x64/x64_stack_layout.h"
 #include "xenia/cpu/processor.h"
-#include "third_party/xbyak/xbyak/xbyak_util.h"
 
 DEFINE_bool(
     enable_haswell_instructions, true,

src/xenia/cpu/backend/x64/x64_emitter.h

@@ -10,9 +10,6 @@
 #ifndef XENIA_BACKEND_X64_X64_EMITTER_H_
 #define XENIA_BACKEND_X64_X64_EMITTER_H_
 
-#include "third_party/xbyak/xbyak/xbyak.h"
-#include "third_party/xbyak/xbyak/xbyak_util.h"
-
 #include "xenia/base/arena.h"
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/hir/instr.h"
@@ -20,6 +17,10 @@
 #include "xenia/debug/function_trace_data.h"
 #include "xenia/memory.h"
 
+// NOTE: must be included last as it expects windows.h to already be included.
+#include "third_party/xbyak/xbyak/xbyak.h"
+#include "third_party/xbyak/xbyak/xbyak_util.h"
+
 namespace xe {
 namespace cpu {
 class DebugInfo;

src/xenia/cpu/mmio_handler_win.cc

@@ -9,8 +9,7 @@
 
 #include "xenia/cpu/mmio_handler.h"
 
-#include <Windows.h>
-
+#include "xenia/base/platform.h"
 #include "xenia/profiling.h"
 
 namespace xe {