diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3569719b..fc7f15144 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -646,7 +646,8 @@ if(M_CORE_DS)
 	list(APPEND DEBUGGER_SRC
 		${CMAKE_CURRENT_SOURCE_DIR}/src/arm/debugger/cli-debugger.c
 		${CMAKE_CURRENT_SOURCE_DIR}/src/arm/debugger/debugger.c
-		${CMAKE_CURRENT_SOURCE_DIR}/src/arm/debugger/memory-debugger.c)
+		${CMAKE_CURRENT_SOURCE_DIR}/src/arm/debugger/memory-debugger.c
+		${CMAKE_CURRENT_SOURCE_DIR}/src/ds/extra/cli.c)
 endif()
 
 source_group("Virtual files" FILES ${CORE_VFS_SRC} ${VFS_SRC})
diff --git a/src/ds/core.c b/src/ds/core.c
index 4b3003e66..0abf32c01 100644
--- a/src/ds/core.c
+++ b/src/ds/core.c
@@ -402,6 +402,7 @@ static void _DSCoreRawWrite16(struct mCore* core, uint32_t address, int segment,
 static void _DSCoreRawWrite32(struct mCore* core, uint32_t address, int segment, uint32_t value) {
 }
 
+#ifdef USE_DEBUGGERS
 static bool _DSCoreSupportsDebuggerType(struct mCore* core, enum mDebuggerType type) {
 	UNUSED(core);
 	switch (type) {
@@ -440,6 +441,7 @@ static void _DSCoreDetachDebugger(struct mCore* core) {
 	DSDetachDebugger(core->board);
 	core->debugger = NULL;
 }
+#endif
 
 static struct mCheatDevice* _DSCoreCheatDevice(struct mCore* core) {
 	return NULL;