diff --git a/Core/HLE/sceMd5.cpp b/Core/HLE/sceMd5.cpp
index 286294d2f0..532428bfe4 100644
--- a/Core/HLE/sceMd5.cpp
+++ b/Core/HLE/sceMd5.cpp
@@ -15,13 +15,14 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "Common/Crypto/md5.h"
+#include "Common/Crypto/sha1.h"
+#include "Common/Data/Random/Rng.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceMd5.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
-#include "Common/Crypto/md5.h"
-#include "Common/Crypto/sha1.h"
 
 #ifdef USE_CRT_DBG
 #undef new
diff --git a/Core/HLE/sceMt19937.cpp b/Core/HLE/sceMt19937.cpp
index f22fcfeb1d..64adebcf81 100644
--- a/Core/HLE/sceMt19937.cpp
+++ b/Core/HLE/sceMt19937.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "Common/Data/Random/Rng.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceMt19937.h"
diff --git a/Core/MIPS/IR/IRInst.h b/Core/MIPS/IR/IRInst.h
index 970faa34c2..1f3b9b2451 100644
--- a/Core/MIPS/IR/IRInst.h
+++ b/Core/MIPS/IR/IRInst.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <vector>
 #include <utility>
 
@@ -16,7 +17,7 @@
 // even be directly JIT-ed, but the gains will probably be tiny over our older direct
 // MIPS->target JITs.
 
-enum class IROp : u8 {
+enum class IROp : uint8_t {
 	Nop,
 
 	SetConst,
diff --git a/Core/MIPS/MIPS.h b/Core/MIPS/MIPS.h
index 5cf3f62c84..dad324609a 100644
--- a/Core/MIPS/MIPS.h
+++ b/Core/MIPS/MIPS.h
@@ -21,7 +21,6 @@
 
 #include <cstddef>
 
-#include "Common/Data/Random/Rng.h"
 #include "Common/CommonTypes.h"
 #include "Core/Opcode.h"