diff --git a/Core/HDRemaster.h b/Core/HDRemaster.h
index 7bfce1606b..e6b6b4cadb 100644
--- a/Core/HDRemaster.h
+++ b/Core/HDRemaster.h
@@ -37,9 +37,7 @@ struct HDRemaster {
 // but they're included for safety.
 // TODO: Do all of the remasters aside from Monster Hunter use double texture coordinates?
 // TODO: Are all remasters happy with this end address?
-const u32 REMASTER_COUNT = 9;
-
-const struct HDRemaster g_HDRemasters[REMASTER_COUNT] = {
+const struct HDRemaster g_HDRemasters[] = {
 	{ "NPJB40001", 0x4000000, 0x0BBFFFFF, false }, // MONSTER HUNTER PORTABLE 3rd HD Ver.
 	{ "BLJM85002", 0x4000000, 0x0BBFFFFF, true }, // K-ON Houkago Live HD Ver
 	{ "NPJB40002", 0x4000000, 0x0BBFFFFF, true }, // K-ON Houkago Live HD Ver
diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
index 240fac7ee5..82e2f85f14 100644
--- a/Core/MemMap.cpp
+++ b/Core/MemMap.cpp
@@ -28,9 +28,6 @@
 #include "CPU.h"
 #include "Debugger/SymbolMap.h"
 
-#include "Loaders.h"
-#include "PSPLoaders.h"
-
 namespace Memory
 {
 
diff --git a/Core/MemMapFunctions.cpp b/Core/MemMapFunctions.cpp
index aa421ef033..b5622af7da 100644
--- a/Core/MemMapFunctions.cpp
+++ b/Core/MemMapFunctions.cpp
@@ -24,8 +24,6 @@
 
 #include "MIPS/MIPS.h"
 
-#include "Core/HDRemaster.h"
-
 // TODO: Fix this
 #undef ENABLE_MEM_CHECK
 
diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp
index 0559a7dcd0..23501c5430 100644
--- a/Core/PSPLoaders.cpp
+++ b/Core/PSPLoaders.cpp
@@ -70,7 +70,7 @@ void InitMemoryForGameISO(std::string fileToStart) {
 		{
 			gameID = g_paramSFO.GetValueString("DISC_ID");
 
-			for(int i = 0; i < REMASTER_COUNT; i++) {
+			for(int i = 0; i < ARRAY_SIZE(g_HDRemasters); i++) {
 				if(g_HDRemasters[i].gameID == gameID) {
 					g_RemasterMode = true;
 					Memory::g_MemoryEnd = g_HDRemasters[i].MemoryEnd;