diff --git a/firmware/target/hosted/game_console/lib/sys_timer.h b/firmware/target/hosted/game_console/lib/sys_timer.h
index 302fc216a2..564ec1bf4a 100644
--- a/firmware/target/hosted/game_console/lib/sys_timer.h
+++ b/firmware/target/hosted/game_console/lib/sys_timer.h
@@ -21,7 +21,6 @@
 #ifndef __SYSTIMER_H__
 #define __SYSTIMER_H__
 
-#include <3ds/svc.h>
 #include "sys_thread.h"
 
 typedef u32 (* timer_callback_ptr) (u32 interval, void *param);
diff --git a/firmware/target/hosted/game_console/system-console.h b/firmware/target/hosted/game_console/system-console.h
index 380c671d90..fe11b74445 100644
--- a/firmware/target/hosted/game_console/system-console.h
+++ b/firmware/target/hosted/game_console/system-console.h
@@ -23,8 +23,6 @@
 #include <stdbool.h>
 #include <stdbool.h>
 
-#include <3ds/types.h>
-#include <3ds/svc.h>
 #include "sys_timer.h"
 #ifdef BIT
 #undef BIT
diff --git a/tools/functions.make b/tools/functions.make
index 1f07e0d381..4e784ff1b1 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -40,7 +40,7 @@ objcopy_plugin = $(OC) $(if $(filter yes, $(PLUGIN_USE_ELF)), -S -x, -O binary)
 else ifneq (,$(findstring sdl-sim,$(APP_TYPE)))
 objcopy = cp $(1) $(1).tmp;mv -f $(1).tmp $(2)		# objcopy simulator
 objcopy_plugin = $(objcopy)
-else ifneq (,$(findstring ctru,$(MODELNAME))) 		# 3dsxtool requires symbols
+else ifneq (,$(findstring 3ds,$(MODELNAME)))  		# 3dsxtool requires symbols
 objcopy = cp $(1) $(1).tmp;mv -f $(1).tmp $(2)
 objcopy_plugin = $(objcopy)
 else