diff --git a/src/xenia/base/bit_stream.cc b/src/xenia/base/bit_stream.cc
index 34aac7350..70a9f1a23 100644
--- a/src/xenia/base/bit_stream.cc
+++ b/src/xenia/base/bit_stream.cc
@@ -10,6 +10,7 @@
 #include "xenia/base/bit_stream.h"
 
 #include <algorithm>
+#include <cstring>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"
diff --git a/src/xenia/base/bit_stream.h b/src/xenia/base/bit_stream.h
index fbe6bccb1..def889a3e 100644
--- a/src/xenia/base/bit_stream.h
+++ b/src/xenia/base/bit_stream.h
@@ -10,6 +10,7 @@
 #ifndef XENIA_BASE_BIT_STREAM_H_
 #define XENIA_BASE_BIT_STREAM_H_
 
+#include <cstddef>
 #include <cstdint>
 
 namespace xe {
diff --git a/src/xenia/base/x64_context.h b/src/xenia/base/x64_context.h
index b07eb6e16..0a9002661 100644
--- a/src/xenia/base/x64_context.h
+++ b/src/xenia/base/x64_context.h
@@ -10,6 +10,8 @@
 #ifndef XENIA_BASE_X64_CONTEXT_H_
 #define XENIA_BASE_X64_CONTEXT_H_
 
+#include <xmmintrin.h>
+
 #include <cstdint>
 #include <string>