diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp
index 966ff2fbda..3b4b1972d0 100644
--- a/Core/Dialog/PSPNetconfDialog.cpp
+++ b/Core/Dialog/PSPNetconfDialog.cpp
@@ -24,6 +24,7 @@
 #include "Core/MemMapHelpers.h"
 #include "Core/Util/PPGeDraw.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceUtility.h"
diff --git a/Core/Dialog/PSPNpSigninDialog.cpp b/Core/Dialog/PSPNpSigninDialog.cpp
index e7e337e85a..977cf08dfd 100644
--- a/Core/Dialog/PSPNpSigninDialog.cpp
+++ b/Core/Dialog/PSPNpSigninDialog.cpp
@@ -26,6 +26,7 @@
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceUtility.h"
 #include "Core/HLE/sceNp.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/Dialog/PSPNpSigninDialog.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Core/Reporting.h"
diff --git a/Core/Dialog/PSPScreenshotDialog.cpp b/Core/Dialog/PSPScreenshotDialog.cpp
index 9437d578bb..83f0d87b21 100644
--- a/Core/Dialog/PSPScreenshotDialog.cpp
+++ b/Core/Dialog/PSPScreenshotDialog.cpp
@@ -20,6 +20,7 @@
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/Dialog/PSPScreenshotDialog.h"
 #include "Core/HLE/sceKernel.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
diff --git a/Core/ELF/ElfReader.cpp b/Core/ELF/ElfReader.cpp
index 73512185d4..0f323f1497 100644
--- a/Core/ELF/ElfReader.cpp
+++ b/Core/ELF/ElfReader.cpp
@@ -26,6 +26,7 @@
 #include "Core/ELF/ElfReader.h"
 #include "Core/Debugger/MemBlockInfo.h"
 #include "Core/Debugger/SymbolMap.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceKernelModule.h"
 
diff --git a/Core/FileSystems/FileSystem.h b/Core/FileSystems/FileSystem.h
index 18a267349b..ca120905ed 100644
--- a/Core/FileSystems/FileSystem.h
+++ b/Core/FileSystems/FileSystem.h
@@ -26,6 +26,7 @@
 #include "Common.h"
 #include "Common/File/Path.h"
 #include "Core/HLE/sceKernel.h"
+#include "Core/HLE/ErrorCodes.h"
 
 enum FileAccess {
 	FILEACCESS_NONE     = 0,
diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp
index 3b0e73bcdc..4339628b24 100644
--- a/Core/HLE/AtracCtx.cpp
+++ b/Core/HLE/AtracCtx.cpp
@@ -22,6 +22,7 @@
 #include "Core/MemMapHelpers.h"
 #include "Core/System.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceAtrac.h"
 #include "Core/HLE/AtracCtx.h"
diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp
index 76395b42d0..837a38d086 100644
--- a/Core/HLE/AtracCtx2.cpp
+++ b/Core/HLE/AtracCtx2.cpp
@@ -5,6 +5,7 @@
 #include "Common/Log.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/System.h"
 #include "Core/HLE/AtracCtx2.h"
diff --git a/Core/HLE/ErrorCodes.h b/Core/HLE/ErrorCodes.h
index 1d2d3373cc..cef1b5f989 100644
--- a/Core/HLE/ErrorCodes.h
+++ b/Core/HLE/ErrorCodes.h
@@ -433,6 +433,15 @@ enum PSPErrorCode : u32 {
 	SCE_PSMFPLAYER_ERROR_INVALID_PARAM = 0x80616008,
 	SCE_PSMFPLAYER_ERROR_NO_MORE_DATA = 0x8061600c,
 
+	SCE_JPEG_ERROR_INVALID_DATA = 0x80650004,
+	SCE_JPEG_ERROR_INVALID_COLORSPACE = 0x80650013,
+	SCE_JPEG_ERROR_INVALID_SIZE = 0x80650020,
+	SCE_JPEG_ERROR_NO_SOI = 0x80650023,
+	SCE_JPEG_ERROR_INVALID_STATE = 0x80650039,
+	SCE_JPEG_ERROR_OUT_OF_MEMORY = 0x80650041,
+	SCE_JPEG_ERROR_ALREADY_INIT = 0x80650042,
+	SCE_JPEG_ERROR_INVALID_VALUE = 0x80650051,
+
 	SCE_FONT_ERROR_OUT_OF_MEMORY = 0x80460001,
 	SCE_FONT_ERROR_INVALID_LIBID = 0x80460002,
 	SCE_FONT_ERROR_INVALID_PARAMETER = 0x80460003,
diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
index ed34dd734c..d61e1168f0 100644
--- a/Core/HLE/HLE.cpp
+++ b/Core/HLE/HLE.cpp
@@ -36,6 +36,7 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/HLE/HLETables.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/HLE/HLEHelperThread.cpp b/Core/HLE/HLEHelperThread.cpp
index cfeba98f92..d90208d75a 100644
--- a/Core/HLE/HLEHelperThread.cpp
+++ b/Core/HLE/HLEHelperThread.cpp
@@ -19,6 +19,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/HLEHelperThread.h"
 #include "Core/HLE/KernelWaitHelpers.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/HLE/NetInetConstants.cpp b/Core/HLE/NetInetConstants.cpp
index 1e8fc697f6..0a8df79a44 100644
--- a/Core/HLE/NetInetConstants.cpp
+++ b/Core/HLE/NetInetConstants.cpp
@@ -5,6 +5,7 @@
 #include "Common/StringUtils.h"
 #include "Core/HLE/NetInetConstants.h"
 #include "Core/HLE/sceKernel.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/HLE.h"
 #ifdef __MINGW32__
 #include <mswsock.h>
diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp
index 781dab1d60..83d4fb109e 100644
--- a/Core/HLE/__sceAudio.cpp
+++ b/Core/HLE/__sceAudio.cpp
@@ -34,6 +34,7 @@
 #include "Core/WaveFile.h"
 #include "Core/ELF/ParamSFO.h"
 #include "Core/HLE/sceKernelTime.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "StringUtils.h"
 #endif
 #include "Core/HLE/__sceAudio.h"
diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
index 242eb8f508..6064478d36 100644
--- a/Core/HLE/sceAtrac.cpp
+++ b/Core/HLE/sceAtrac.cpp
@@ -20,6 +20,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp
index 6311b94252..8cb8f535fa 100644
--- a/Core/HLE/sceAudio.cpp
+++ b/Core/HLE/sceAudio.cpp
@@ -21,6 +21,7 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceAudio.h"
diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp
index c5160d7e90..12bd2710b4 100644
--- a/Core/HLE/sceCtrl.cpp
+++ b/Core/HLE/sceCtrl.cpp
@@ -23,6 +23,7 @@
 #include "Common/Math/math_util.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 0b7bae03cc..ed16d32c1e 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -43,6 +43,7 @@
 #include "Core/Core.h"
 #include "Core/System.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceDisplay.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp
index df43ec3a78..05ec30520c 100644
--- a/Core/HLE/sceDmac.cpp
+++ b/Core/HLE/sceDmac.cpp
@@ -21,6 +21,7 @@
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceDmac.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/FunctionWrappers.h"
diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp
index a34166e3c4..e2727436d1 100644
--- a/Core/HLE/sceGe.cpp
+++ b/Core/HLE/sceGe.cpp
@@ -25,6 +25,7 @@
 #include "Common/Serialize/SerializeMap.h"
 #include "Common/Data/Collections/ThreadSafeList.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreParameter.h"
diff --git a/Core/HLE/sceHeap.cpp b/Core/HLE/sceHeap.cpp
index 69c808f847..48d8a83076 100644
--- a/Core/HLE/sceHeap.cpp
+++ b/Core/HLE/sceHeap.cpp
@@ -23,6 +23,7 @@
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceHeap.h"
diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp
index a5aa00d180..6a36851aa6 100644
--- a/Core/HLE/sceJpeg.cpp
+++ b/Core/HLE/sceJpeg.cpp
@@ -23,6 +23,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Debugger/MemBlockInfo.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceJpeg.h"
 #include "Core/HLE/sceKernel.h"
@@ -56,17 +57,6 @@ void __JpegInit() {
 	mjpegHeight = 0;
 }
 
-enum : uint32_t {
-	ERROR_JPEG_INVALID_DATA = 0x80650004,
-	ERROR_JPEG_INVALID_COLORSPACE = 0x80650013,
-	ERROR_JPEG_INVALID_SIZE = 0x80650020,
-	ERROR_JPEG_NO_SOI = 0x80650023,
-	ERROR_JPEG_INVALID_STATE = 0x80650039,
-	ERROR_JPEG_OUT_OF_MEMORY = 0x80650041,
-	ERROR_JPEG_ALREADY_INIT = 0x80650042,
-	ERROR_JPEG_INVALID_VALUE = 0x80650051,
-};
-
 void __JpegDoState(PointerWrap &p) {
 	auto s = p.Section("sceJpeg", 1, 2);
 	if (!s)
@@ -112,7 +102,7 @@ static u32 convertYCbCrToABGR(int y, int cb, int cr) {
 
 static int JpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int bufferWidth, uint32_t chroma, int &usec) {
 	if ((chroma & 0x000FFFFF) != 0x00020202 && (chroma & 0x000FFFFF) != 0x00020201 && (chroma & 0x000FFFFF) != 0x00020101)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_COLORSPACE, "invalid colorspace");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_COLORSPACE, "invalid colorspace");
 	if (bufferWidth < 0)
 		bufferWidth = 0;
 
@@ -128,9 +118,9 @@ static int JpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int bufferWidt
 
 	uint64_t destSize = ((uint64_t)bufferWidth * (height - 1) + width) * 4;
 	if (destSize > 0x3FFFFFFF || !Memory::IsValidRange(imageAddr, (uint32_t)destSize))
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid dest address or size");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid dest address or size");
 	if (sizeY > 0x3FFFFFFF || !Memory::IsValidRange(yCbCrAddr, sizeY + sizeCb + sizeCb))
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid src address or size");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid src address or size");
 
 	u32_le *imageBuffer = (u32_le *)Memory::GetPointerWriteUnchecked(imageAddr);
 	const u8 *Y = (const u8 *)Memory::GetPointerUnchecked(yCbCrAddr);
@@ -188,9 +178,9 @@ static int JpegMJpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int buffe
 	int sizeCb = sizeY >> 2;
 
 	if (width > 720 || height > 480)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid size, max 720x480");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid size, max 720x480");
 	if (bufferWidth > 1024)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid stride, max 1024");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid stride, max 1024");
 	uint32_t destSize = (bufferWidth * (height - 1) + width) * 4;
 	if (!Memory::IsValidRange(imageAddr, destSize))
 		return hleLogError(Log::ME, SCE_KERNEL_ERROR_INVALID_POINTER, "invalid dest address or size");
@@ -271,15 +261,15 @@ static u32 convertARGBtoABGR(u32 argb) {
 
 static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
 	if (!Memory::IsValidRange(jpegAddr, jpegSize))
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
 	if (jpegSize == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
 
 	NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegDecodeMJpeg");
 
 	const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
 	if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
 
 	int width, height, actual_components;
 	unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
@@ -292,7 +282,7 @@ static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
 	}
 
 	if (jpegBuf == nullptr) {
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
 	}
 
 	usec += (width * height) / 14;
@@ -304,7 +294,7 @@ static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
 	// Note: even if you Delete, the size is still allowed.
 	if (width > mjpegWidth || height > mjpegHeight) {
 		free(jpegBuf);
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid output address");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid output address");
 	}
 	if (mjpegInited == 0) {
 		// If you finish after setting the size, then call this - you get an interesting error.
@@ -368,15 +358,15 @@ static int getYCbCrBufferSize(int w, int h) {
 
 static int JpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr) {
 	if (!Memory::IsValidRange(jpegAddr, jpegSize))
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
 	if (jpegSize == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
 
 	NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegGetOutputInfo");
 
 	const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
 	if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
 
 	int width, height, actual_components;
 	unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
@@ -389,7 +379,7 @@ static int JpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr) {
 	}
 
 	if (jpegBuf == nullptr) {
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
 	}
 
 	free(jpegBuf);
@@ -506,15 +496,15 @@ static int JpegConvertRGBToYCbCr(const void *data, u8 *output, int width, int he
 
 static int JpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, int yCbCrSize, int &usec) {
 	if (!Memory::IsValidRange(jpegAddr, jpegSize))
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
 	if (jpegSize == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
 
 	NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegDecodeMJpegYCbCr");
 
 	const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
 	if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
-		return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
 
 	int width, height, actual_components;
 	unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
@@ -527,12 +517,12 @@ static int JpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, int y
 	}
 
 	if (jpegBuf == nullptr) {
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
 	}
 
 	if (yCbCrSize < getYCbCrBufferSize(width, height)) {
 		free(jpegBuf);
-		return hleLogError(Log::ME, ERROR_JPEG_OUT_OF_MEMORY, "buffer not large enough");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_OUT_OF_MEMORY, "buffer not large enough");
 	}
 
 	// Technically, it seems like the PSP doesn't support grayscale, but we might as well.
@@ -559,7 +549,7 @@ static int sceJpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, in
 	if ((yCbCrAddr | yCbCrSize | (yCbCrAddr + yCbCrSize)) & 0x80000000)
 		return hleLogError(Log::ME, SCE_KERNEL_ERROR_PRIV_REQUIRED, "invalid output address");
 	if (!Memory::IsValidRange(jpegAddr, jpegSize))
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid jpeg address");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid jpeg address");
 
 	int usec = 300;
 	int result = JpegDecodeMJpegYCbCr(jpegAddr, jpegSize, yCbCrAddr, yCbCrSize, usec);
@@ -585,11 +575,11 @@ static int sceJpeg_9B36444C() {
 
 static int sceJpegCreateMJpeg(int width, int height) {
 	if (mjpegInited == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet inited");
 	if (mjpegInited == 2)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "already created");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "already created");
 	if (width > 1024)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "width outside bounds");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "width outside bounds");
 
 	mjpegInited = 2;
 	mjpegWidth = width;
@@ -600,9 +590,9 @@ static int sceJpegCreateMJpeg(int width, int height) {
 
 static int sceJpegDeleteMJpeg() {
 	if (mjpegInited == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet inited");
 	if (mjpegInited == 1)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet created");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet created");
 
 	mjpegInited = 1;
 	return hleLogInfo(Log::ME, 0);
@@ -610,7 +600,7 @@ static int sceJpegDeleteMJpeg() {
 
 static int sceJpegInitMJpeg() {
 	if (mjpegInited == 1 || mjpegInited == 2)
-		return hleLogError(Log::ME, ERROR_JPEG_ALREADY_INIT, "already inited");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_ALREADY_INIT, "already inited");
 
 	// If it was -1, it's from an old save state, avoid double init error but assume inited.
 	if (mjpegInited == 0)
@@ -620,9 +610,9 @@ static int sceJpegInitMJpeg() {
 
 static int sceJpegFinishMJpeg() {
 	if (mjpegInited == 0)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "already inited");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "already inited");
 	if (mjpegInited == 2)
-		return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "mjpeg not deleted");
+		return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "mjpeg not deleted");
 
 	// Even from an old save state, if we see this we leave compat mode.
 	mjpegInited = 0;
diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
index ac4cb12f5a..d06b9ceda1 100644
--- a/Core/HLE/sceKernel.cpp
+++ b/Core/HLE/sceKernel.cpp
@@ -25,6 +25,7 @@
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 1bb3ac8363..1780c1cc0f 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -24,8 +24,6 @@
 #include "Common/Log.h"
 #include "Common/Swap.h"
 
-#include "Core/HLE/ErrorCodes.h"
-
 class PointerWrap;
 
 // If you add to this, make sure to check KernelObjectPool::CreateByIDType().
@@ -193,7 +191,7 @@ public:
 				outError = T::GetMissingErrorCode();
 				return nullptr;
 			}
-			outError = SCE_KERNEL_ERROR_OK;
+			outError = 0; // SCE_KERNEL_ERROR_OK but don't want to include the header here.
 			return t;
 		}
 	}
diff --git a/Core/HLE/sceKernelAlarm.cpp b/Core/HLE/sceKernelAlarm.cpp
index 5fa76a1986..fc951ac7aa 100644
--- a/Core/HLE/sceKernelAlarm.cpp
+++ b/Core/HLE/sceKernelAlarm.cpp
@@ -23,6 +23,7 @@
 #include "Core/HLE/sceKernelAlarm.h"
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMap.h"
 
diff --git a/Core/HLE/sceKernelEventFlag.cpp b/Core/HLE/sceKernelEventFlag.cpp
index 8d8cefc0b7..18581860f0 100644
--- a/Core/HLE/sceKernelEventFlag.cpp
+++ b/Core/HLE/sceKernelEventFlag.cpp
@@ -19,6 +19,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/HLE/sceKernelHeap.cpp b/Core/HLE/sceKernelHeap.cpp
index c41bec2921..5c4439e7e7 100644
--- a/Core/HLE/sceKernelHeap.cpp
+++ b/Core/HLE/sceKernelHeap.cpp
@@ -4,6 +4,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelHeap.h"
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
index d8a004de28..e847e54164 100644
--- a/Core/HLE/sceKernelInterrupt.cpp
+++ b/Core/HLE/sceKernelInterrupt.cpp
@@ -28,6 +28,7 @@
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/MIPS/MIPS.h"
 
 #include "Core/Debugger/MemBlockInfo.h"
diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp
index 543b57d97b..d72d72b6a3 100644
--- a/Core/HLE/sceKernelMbx.cpp
+++ b/Core/HLE/sceKernelMbx.cpp
@@ -24,6 +24,7 @@
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernelMbx.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp
index 55269af1a5..160bb66f4c 100644
--- a/Core/HLE/sceKernelMemory.cpp
+++ b/Core/HLE/sceKernelMemory.cpp
@@ -26,6 +26,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/Debugger/MemBlockInfo.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp
index 400d92e69e..37b773e549 100644
--- a/Core/HLE/sceKernelMsgPipe.cpp
+++ b/Core/HLE/sceKernelMsgPipe.cpp
@@ -24,6 +24,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelMsgPipe.h"
 #include "Core/HLE/sceKernelMemory.h"
diff --git a/Core/HLE/sceKernelSemaphore.cpp b/Core/HLE/sceKernelSemaphore.cpp
index 193ea5a561..70908f34ab 100644
--- a/Core/HLE/sceKernelSemaphore.cpp
+++ b/Core/HLE/sceKernelSemaphore.cpp
@@ -20,6 +20,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index 9ccc1ce6c3..af1d8bf8f2 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -29,6 +29,7 @@
 #include "Common/Serialize/SerializeList.h"
 #include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/HLETables.h"
 #include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp
index 21c2499a74..c6e1d4e140 100644
--- a/Core/HLE/sceKernelVTimer.cpp
+++ b/Core/HLE/sceKernelVTimer.cpp
@@ -28,6 +28,7 @@
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceKernelVTimer.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 
 static int vtimerTimer = -1;
 static SceUID runningVTimer = 0;
diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp
index 32ead611ac..6a5f57d990 100644
--- a/Core/HLE/sceMp3.cpp
+++ b/Core/HLE/sceMp3.cpp
@@ -72,6 +72,7 @@
 #include "Core/Config.h"
 #include "Core/Debugger/MemBlockInfo.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceMp3.h"
diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp
index 7908daef80..91c50bb6ee 100644
--- a/Core/HLE/sceNet.cpp
+++ b/Core/HLE/sceNet.cpp
@@ -31,6 +31,7 @@
 #include "Common/Serialize/SerializeMap.h"
 #include "Common/Data/Format/JSONReader.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index 548b02c554..500287d2d9 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -41,6 +41,7 @@
 #include "Core/MemMapHelpers.h"
 
 #include "Core/HLE/HLEHelperThread.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/HLE/sceNetAdhocMatching.cpp b/Core/HLE/sceNetAdhocMatching.cpp
index d42166aee1..1b275ec1ac 100644
--- a/Core/HLE/sceNetAdhocMatching.cpp
+++ b/Core/HLE/sceNetAdhocMatching.cpp
@@ -23,7 +23,6 @@
 #include <algorithm>
 
 
-#include "Core/HLE/FunctionWrappers.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/TimeUtil.h"
 #include "Core/Core.h"
@@ -35,7 +34,9 @@
 #include "Core/MemMapHelpers.h"
 #include "Common/Serialize/SerializeFuncs.h"
 
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelMemory.h"
+#include "Core/HLE/ErrorCodes.h"
 
 
 std::vector<SceUID> matchingThreads;
diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp
index 262d5c74a8..5734efd6e8 100644
--- a/Core/HLE/scePower.cpp
+++ b/Core/HLE/scePower.cpp
@@ -21,6 +21,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
index b6e1d032b5..885eab5ee9 100644
--- a/Core/HLE/sceRtc.cpp
+++ b/Core/HLE/sceRtc.cpp
@@ -29,6 +29,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/TimeUtil.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp
index c8d4a0c4c6..85710b93f2 100644
--- a/Core/HLE/sceSas.cpp
+++ b/Core/HLE/sceSas.cpp
@@ -38,13 +38,14 @@
 #include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
-#include "Core/HLE/HLE.h"
-#include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/HW/SasAudio.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
+#include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceSas.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/HLE/sceUsb.cpp b/Core/HLE/sceUsb.cpp
index 076c203090..a031be6356 100644
--- a/Core/HLE/sceUsb.cpp
+++ b/Core/HLE/sceUsb.cpp
@@ -19,6 +19,7 @@
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/KernelWaitHelpers.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
index fae1d9cdb3..cbe1a8f7c8 100644
--- a/Core/HLE/sceUtility.cpp
+++ b/Core/HLE/sceUtility.cpp
@@ -27,6 +27,7 @@
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/HLEHelperThread.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceVaudio.cpp b/Core/HLE/sceVaudio.cpp
index 841de68681..cd0969911d 100644
--- a/Core/HLE/sceVaudio.cpp
+++ b/Core/HLE/sceVaudio.cpp
@@ -20,6 +20,7 @@
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceVaudio.h"
 #include "Core/HLE/sceAudio.h"
 #include "Core/HLE/__sceAudio.h"
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 3f245e743c..a12caa9d88 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -22,6 +22,7 @@
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/sceKernelThread.h"