diff --git a/Common/TimeUtil.cpp b/Common/TimeUtil.cpp
index d0466353e8..106f761b74 100644
--- a/Common/TimeUtil.cpp
+++ b/Common/TimeUtil.cpp
@@ -1,4 +1,5 @@
 #include <cstdio>
+#include <cstdint>
 
 #include "Common/TimeUtil.h"
 
diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp
index d43cd130d3..a48887f935 100644
--- a/Core/MIPS/MIPSInt.cpp
+++ b/Core/MIPS/MIPSInt.cpp
@@ -19,6 +19,7 @@
 
 #include "math/math_util.h"
 
+#include "Common/ByteSwap.h"
 #include "Common/Common.h"
 #include "Common/BitScan.h"
 #include "Core/Config.h"
diff --git a/ext/native/math/expression_parser.cpp b/ext/native/math/expression_parser.cpp
index f4aa82ff56..5d71182242 100644
--- a/ext/native/math/expression_parser.cpp
+++ b/ext/native/math/expression_parser.cpp
@@ -1,7 +1,8 @@
 #include "expression_parser.h"
 #include <ctype.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 
 typedef enum {
 	EXOP_BRACKETL, EXOP_BRACKETR, EXOP_MEML, EXOP_MEMR, EXOP_MEMSIZE, EXOP_SIGNPLUS, EXOP_SIGNMINUS,