diff --git a/arm11/Makefile b/arm11/Makefile
index b923a15..64f6cde 100644
--- a/arm11/Makefile
+++ b/arm11/Makefile
@@ -22,7 +22,7 @@ BUILD		:=	build
 SOURCES		+=	../source ../source/arm11 ../libraries/inih
 DATA		:=
 INCLUDES	+=	../include ../libraries
-DEFINES		:=	-DARM11 -D_3DS -DVERS_STRING=\"$(VERS_STRING)\" \
+DEFINES		:=	-DARM11 -D__3DS__ -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
 				-DVERS_MAJOR=$(VERS_MAJOR) -DVERS_MINOR=$(VERS_MINOR)
 ASSETS		:=
 
diff --git a/arm9/Makefile b/arm9/Makefile
index ae8e1dc..3a2a67b 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -22,7 +22,7 @@ BUILD		:=	build
 SOURCES		+=	../source/arm9
 DATA		:=
 INCLUDES	+=	../include ../thirdparty
-DEFINES		:=	-DARM9 -D_3DS -DVERS_STRING=\"$(VERS_STRING)\" \
+DEFINES		:=	-DARM9 -D__3DS__ -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
 				-DVERS_MAJOR=$(VERS_MAJOR) -DVERS_MINOR=$(VERS_MINOR)
 
 ifneq ($(strip $(NO_DEBUG)),)
diff --git a/libraries/libn3ds b/libraries/libn3ds
index fef1cd5..8f88216 160000
--- a/libraries/libn3ds
+++ b/libraries/libn3ds
@@ -1 +1 @@
-Subproject commit fef1cd5851cf2ef32b4a0a983066f12220af418b
+Subproject commit 8f88216789f47916755bc591546e842af83eb18c