diff --git a/src/xenia/cpu/backend/x64/x64_backend.cc b/src/xenia/cpu/backend/x64/x64_backend.cc
index b3bed290b..5245e82da 100644
--- a/src/xenia/cpu/backend/x64/x64_backend.cc
+++ b/src/xenia/cpu/backend/x64/x64_backend.cc
@@ -9,6 +9,8 @@
 
 #include "xenia/cpu/backend/x64/x64_backend.h"
 
+#include <stddef.h>
+
 #include "third_party/capstone/include/capstone.h"
 #include "third_party/capstone/include/x86.h"
 #include "xenia/base/exception_handler.h"
diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc
index 16c4c5eb5..f22954026 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -13,6 +13,7 @@
 
 #include <climits>
 #include <cstring>
+#include <stddef.h>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/atomic.h"
diff --git a/src/xenia/cpu/hir/value.cc b/src/xenia/cpu/hir/value.cc
index 54b7c5c1c..c9c45b6a0 100644
--- a/src/xenia/cpu/hir/value.cc
+++ b/src/xenia/cpu/hir/value.cc
@@ -10,6 +10,7 @@
 #include "xenia/cpu/hir/value.h"
 
 #include <cmath>
+#include <cstdlib>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"
@@ -1330,7 +1331,7 @@ void Value::VectorSub(Value* other, TypeName type, bool is_unsigned,
 void Value::DotProduct3(Value* other) {
   assert_true(this->type == VEC128_TYPE && other->type == VEC128_TYPE);
   switch (type) {
-    case VEC128_TYPE:
+    case VEC128_TYPE: {
       alignas(16) float result[4];
       __m128 src1 = _mm_load_ps(constant.v128.f32);
       __m128 src2 = _mm_load_ps(other->constant.v128.f32);
@@ -1339,7 +1340,7 @@ void Value::DotProduct3(Value* other) {
       // TODO(rick): is this sane?
       type = FLOAT32_TYPE;
       constant.f32 = result[0];
-      break;
+    } break;
     default:
       assert_unhandled_case(type);
       break;
@@ -1349,7 +1350,7 @@ void Value::DotProduct3(Value* other) {
 void Value::DotProduct4(Value* other) {
   assert_true(this->type == VEC128_TYPE && other->type == VEC128_TYPE);
   switch (type) {
-    case VEC128_TYPE:
+    case VEC128_TYPE: {
       alignas(16) float result[4];
       __m128 src1 = _mm_load_ps(constant.v128.f32);
       __m128 src2 = _mm_load_ps(other->constant.v128.f32);
@@ -1358,7 +1359,7 @@ void Value::DotProduct4(Value* other) {
       // TODO(rick): is this sane?
       type = FLOAT32_TYPE;
       constant.f32 = result[0];
-      break;
+    } break;
     default:
       assert_unhandled_case(type);
       break;
diff --git a/src/xenia/cpu/ppc/ppc_emit_control.cc b/src/xenia/cpu/ppc/ppc_emit_control.cc
index 0bd9cbd2e..e4a89be83 100644
--- a/src/xenia/cpu/ppc/ppc_emit_control.cc
+++ b/src/xenia/cpu/ppc/ppc_emit_control.cc
@@ -15,6 +15,8 @@
 #include "xenia/cpu/ppc/ppc_frontend.h"
 #include "xenia/cpu/ppc/ppc_hir_builder.h"
 
+#include <stddef.h>
+
 namespace xe {
 namespace cpu {
 namespace ppc {
diff --git a/src/xenia/cpu/ppc/ppc_emit_fpu.cc b/src/xenia/cpu/ppc/ppc_emit_fpu.cc
index a7e824214..d3b12c3e7 100644
--- a/src/xenia/cpu/ppc/ppc_emit_fpu.cc
+++ b/src/xenia/cpu/ppc/ppc_emit_fpu.cc
@@ -13,6 +13,8 @@
 #include "xenia/cpu/ppc/ppc_context.h"
 #include "xenia/cpu/ppc/ppc_hir_builder.h"
 
+#include <stddef.h>
+
 namespace xe {
 namespace cpu {
 namespace ppc {
@@ -349,7 +351,7 @@ int InstrEmit_mtfsfx(PPCHIRBuilder& f, const InstrData& i) {
     // i.XFL.W;
     // i.XFL.FM;
     f.StoreFPSCR(
-        f.Truncate(f.Cast(f.LoadFPR(i.XFL.RB), INT64_TYPE), INT32_TYPE));
+      f.Truncate(f.Cast(f.LoadFPR(i.XFL.RB), INT64_TYPE), INT32_TYPE));
   }
   if (i.XFL.Rc) {
     f.CopyFPSCRToCR1();
diff --git a/src/xenia/cpu/ppc/ppc_emit_memory.cc b/src/xenia/cpu/ppc/ppc_emit_memory.cc
index e9294048e..da93f403a 100644
--- a/src/xenia/cpu/ppc/ppc_emit_memory.cc
+++ b/src/xenia/cpu/ppc/ppc_emit_memory.cc
@@ -13,6 +13,8 @@
 #include "xenia/cpu/ppc/ppc_context.h"
 #include "xenia/cpu/ppc/ppc_hir_builder.h"
 
+#include <stddef.h>
+
 namespace xe {
 namespace cpu {
 namespace ppc {
diff --git a/src/xenia/cpu/ppc/ppc_hir_builder.cc b/src/xenia/cpu/ppc/ppc_hir_builder.cc
index 3187983bb..448ea3d59 100644
--- a/src/xenia/cpu/ppc/ppc_hir_builder.cc
+++ b/src/xenia/cpu/ppc/ppc_hir_builder.cc
@@ -10,6 +10,7 @@
 #include "xenia/cpu/ppc/ppc_hir_builder.h"
 
 #include <cstring>
+#include <stddef.h>
 
 #include "xenia/base/byte_order.h"
 #include "xenia/base/logging.h"
diff --git a/src/xenia/cpu/ppc/ppc_opcode.h b/src/xenia/cpu/ppc/ppc_opcode.h
index a15526b78..2a27a09ed 100644
--- a/src/xenia/cpu/ppc/ppc_opcode.h
+++ b/src/xenia/cpu/ppc/ppc_opcode.h
@@ -1,9 +1,10 @@
-// This code was autogenerated by tools/ppc-table-gen.py. Do not modify!
+// This code was autogenerated by ./tools/ppc-table-gen. Do not modify!
 // clang-format off
 #ifndef XENIA_CPU_PPC_PPC_OPCODE_H_
 #define XENIA_CPU_PPC_PPC_OPCODE_H_
 
 #include <cstdint>
+#include <cstdlib>
 
 namespace xe {
 namespace cpu {
diff --git a/src/xenia/cpu/ppc/ppc_opcode_disasm.cc b/src/xenia/cpu/ppc/ppc_opcode_disasm.cc
index 8c54fbd09..173f89442 100644
--- a/src/xenia/cpu/ppc/ppc_opcode_disasm.cc
+++ b/src/xenia/cpu/ppc/ppc_opcode_disasm.cc
@@ -1,6 +1,7 @@
-// This code was autogenerated by tools/ppc-table-gen.py. Do not modify!
+// This code was autogenerated by ./tools/ppc-table-gen. Do not modify!
 // clang-format off
 #include <cstdint>
+#include <cstdlib>
 
 #include "xenia/base/assert.h"
 #include "xenia/cpu/ppc/ppc_decode_data.h"
diff --git a/src/xenia/cpu/ppc/ppc_opcode_lookup.cc b/src/xenia/cpu/ppc/ppc_opcode_lookup.cc
index eeb4362e6..c43a26f28 100644
--- a/src/xenia/cpu/ppc/ppc_opcode_lookup.cc
+++ b/src/xenia/cpu/ppc/ppc_opcode_lookup.cc
@@ -1,6 +1,7 @@
-// This code was autogenerated by tools/ppc-table-gen.py. Do not modify!
+// This code was autogenerated by ./tools/ppc-table-gen. Do not modify!
 // clang-format off
 #include <cstdint>
+#include <cstdlib>
 
 #include "xenia/base/assert.h"
 #include "xenia/cpu/ppc/ppc_opcode.h"
diff --git a/src/xenia/cpu/ppc/ppc_opcode_table.cc b/src/xenia/cpu/ppc/ppc_opcode_table.cc
index 9b7372e81..43210f5fb 100644
--- a/src/xenia/cpu/ppc/ppc_opcode_table.cc
+++ b/src/xenia/cpu/ppc/ppc_opcode_table.cc
@@ -1,6 +1,7 @@
-// This code was autogenerated by tools/ppc-table-gen.py. Do not modify!
+// This code was autogenerated by ./tools/ppc-table-gen. Do not modify!
 // clang-format off
 #include <cstdint>
+#include <cstdlib>
 
 #include "xenia/base/assert.h"
 #include "xenia/cpu/ppc/ppc_opcode.h"