diff --git a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc b/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
index e1234e13d..40bac4134 100644
--- a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
+++ b/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
@@ -10,6 +10,7 @@
 #include "xenia/cpu/compiler/passes/constant_propagation_pass.h"
 
 #include <gflags/gflags.h>
+#include <cmath>
 
 #include "xenia/base/assert.h"
 #include "xenia/base/profiling.h"
@@ -303,10 +304,10 @@ bool ConstantPropagationPass::Run(HIRBuilder* builder) {
         case OPCODE_IS_NAN:
           if (i->src1.value->IsConstant()) {
             if (i->src1.value->type == FLOAT32_TYPE &&
-                isnan(i->src1.value->constant.f32)) {
+                std::isnan(i->src1.value->constant.f32)) {
               v->set_constant(uint8_t(1));
             } else if (i->src1.value->type == FLOAT64_TYPE &&
-                       isnan(i->src1.value->constant.f64)) {
+                       std::isnan(i->src1.value->constant.f64)) {
               v->set_constant(uint8_t(1));
             } else {
               v->set_constant(uint8_t(0));
diff --git a/src/xenia/gpu/command_processor.cc b/src/xenia/gpu/command_processor.cc
index 2ca105c76..73f79923b 100644
--- a/src/xenia/gpu/command_processor.cc
+++ b/src/xenia/gpu/command_processor.cc
@@ -10,6 +10,7 @@
 #include "xenia/gpu/command_processor.h"
 
 #include <algorithm>
+#include <cmath>
 
 #include "xenia/base/byte_stream.h"
 #include "xenia/base/logging.h"
diff --git a/src/xenia/gpu/texture_info.cc b/src/xenia/gpu/texture_info.cc
index 8c226f538..f7f0a5ed4 100644
--- a/src/xenia/gpu/texture_info.cc
+++ b/src/xenia/gpu/texture_info.cc
@@ -10,6 +10,7 @@
 #include "xenia/gpu/texture_info.h"
 
 #include <algorithm>
+#include <cmath>
 #include <cstring>
 
 #include "third_party/xxhash/xxhash.h"
diff --git a/third_party/llvm/include/llvm/Support/MathExtras.h b/third_party/llvm/include/llvm/Support/MathExtras.h
index 4d2ff0989..92b43bc88 100644
--- a/third_party/llvm/include/llvm/Support/MathExtras.h
+++ b/third_party/llvm/include/llvm/Support/MathExtras.h
@@ -18,8 +18,9 @@
 #ifdef IGNORED_LLVM_XENIA
 #include "llvm/Support/SwapByteOrder.h"
 #endif  // IGNORED_LLVM_XENIA
-#include "llvm/Support/type_traits.h"
+#include <cmath>
 #include <cstring>
+#include "llvm/Support/type_traits.h"
 
 #ifdef _MSC_VER
 #include <intrin.h>