diff --git a/src/platform/3ds/3ds-memory.c b/src/platform/3ds/3ds-memory.c
deleted file mode 100644
index c37e4637b..000000000
--- a/src/platform/3ds/3ds-memory.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include <mgba-util/memory.h>
-
-#include <3ds.h>
-
-void* anonymousMemoryMap(size_t size) {
-	return linearAlloc(size);
-}
-
-void mappedMemoryFree(void* memory, size_t size) {
-	UNUSED(size);
-	linearFree(memory);
-}
diff --git a/src/platform/3ds/CMakeLists.txt b/src/platform/3ds/CMakeLists.txt
index 54787189f..ef70eed51 100644
--- a/src/platform/3ds/CMakeLists.txt
+++ b/src/platform/3ds/CMakeLists.txt
@@ -19,8 +19,12 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDeb
 else()
 	list(APPEND OS_LIB citro3d ctru)
 endif()
-file(GLOB OS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/3ds-*.c ${CMAKE_CURRENT_SOURCE_DIR}/ctru-heap.c ${CMAKE_CURRENT_SOURCE_DIR}/socket.c)
-set(OS_SRC ${OS_SRC} PARENT_SCOPE)
+set(OS_SRC
+	${PROJECT_SOURCE_DIR}/src/util/memory.c
+	${CMAKE_CURRENT_SOURCE_DIR}/3ds-vfs.c
+	${CMAKE_CURRENT_SOURCE_DIR}/ctru-heap.c
+	${CMAKE_CURRENT_SOURCE_DIR}/socket.c
+	PARENT_SCOPE)
 set(OS_LIB ${OS_LIB} PARENT_SCOPE)
 source_group("3DS-specific code" FILES ${OS_SRC})
 
diff --git a/src/platform/3ds/ctru-heap.c b/src/platform/3ds/ctru-heap.c
index 25e606c1d..ea2f4d450 100644
--- a/src/platform/3ds/ctru-heap.c
+++ b/src/platform/3ds/ctru-heap.c
@@ -7,9 +7,6 @@
 
 #include <mgba-util/common.h>
 
-u32 __ctru_heap_size = 0x02400000;
-u32 __ctru_linear_heap_size = 0x01400000;
-
 uint32_t* romBuffer = NULL;
 size_t romBufferSize;