diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6cc60fd58..c17290b9b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -29,6 +29,7 @@ set(SRCS
             hle/kernel/address_arbiter.cpp
             hle/kernel/event.cpp
             hle/kernel/kernel.cpp
+            hle/kernel/memory.cpp
             hle/kernel/mutex.cpp
             hle/kernel/process.cpp
             hle/kernel/resource_limit.cpp
@@ -115,7 +116,6 @@ set(SRCS
             loader/loader.cpp
             loader/ncch.cpp
             tracer/recorder.cpp
-            mem_map.cpp
             memory.cpp
             settings.cpp
             system.cpp
@@ -157,6 +157,7 @@ set(HEADERS
             hle/kernel/address_arbiter.h
             hle/kernel/event.h
             hle/kernel/kernel.h
+            hle/kernel/memory.h
             hle/kernel/mutex.h
             hle/kernel/process.h
             hle/kernel/resource_limit.h
@@ -245,7 +246,6 @@ set(HEADERS
             loader/ncch.h
             tracer/recorder.h
             tracer/citrace.h
-            mem_map.h
             memory.h
             memory_setup.h
             settings.h
diff --git a/src/core/mem_map.cpp b/src/core/hle/kernel/memory.cpp
similarity index 99%
rename from src/core/mem_map.cpp
rename to src/core/hle/kernel/memory.cpp
index f6a063825..57e1912d3 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -14,7 +14,6 @@
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/result.h"
 #include "core/hle/shared_page.h"
-#include "core/mem_map.h"
 #include "core/memory.h"
 #include "core/memory_setup.h"
 
diff --git a/src/core/mem_map.h b/src/core/hle/kernel/memory.h
similarity index 100%
rename from src/core/mem_map.h
rename to src/core/hle/kernel/memory.h
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 561824305..2cd1cfc14 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -7,11 +7,11 @@
 #include "common/logging/log.h"
 #include "common/make_unique.h"
 
+#include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/vm_manager.h"
-#include "core/mem_map.h"
 #include "core/memory.h"
 
 namespace Kernel {
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 91260fe71..b944f4af0 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -10,11 +10,11 @@
 #include "common/symbols.h"
 
 #include "core/core_timing.h"
-#include "core/mem_map.h"
 #include "core/arm/arm_interface.h"
 
 #include "core/hle/kernel/address_arbiter.h"
 #include "core/hle/kernel/event.h"
+#include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 561ff82f0..8d80ef372 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -4,11 +4,11 @@
 
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/mem_map.h"
 #include "core/system.h"
 #include "core/hw/hw.h"
 #include "core/hle/hle.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/memory.h"
 
 #include "video_core/video_core.h"