diff --git a/arm11/Makefile b/arm11/Makefile
index 1b8a179..f1ba347 100644
--- a/arm11/Makefile
+++ b/arm11/Makefile
@@ -25,7 +25,7 @@ SOURCES		:=	../libn3ds/kernel/source ../libn3ds/source ../libn3ds/source/drivers
 DATA		:=
 INCLUDES	:=	../libn3ds/include ../libn3ds/include/arm11 ../libn3ds/kernel/include ../libn3ds/thirdparty ../include \
 				../thirdparty
-DEFINES		:=	-D__ARM11__ -D_3DS -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
+DEFINES		:=	-D__ARM11__ -D__3DS__ -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
 				-DVERS_MAJOR=$(VERS_MAJOR) -DVERS_MINOR=$(VERS_MINOR)
 ASSETS		:=
 
@@ -38,11 +38,11 @@ endif
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv6k+vfpv2 -mtune=mpcore -mfloat-abi=hard -mtp=soft -marm -mthumb-interwork
 
-CFLAGS	:=	$(ARCH) -std=c17 -O2 -gdwarf-4 -mword-relocations \
+CFLAGS	:=	$(ARCH) -std=c23 -O2 -gdwarf-4 -mword-relocations \
 			-ffunction-sections -fno-math-errno -Wall -Wextra
 CFLAGS	+=	$(INCLUDE) $(DEFINES)
 
-CXXFLAGS	:=	$(ARCH) -std=c++17 -O2 -flto -gdwarf-4 -fno-rtti -fno-exceptions \
+CXXFLAGS	:=	$(ARCH) -std=c++23 -O2 -flto -gdwarf-4 -fno-rtti -fno-exceptions \
 				-mword-relocations -ffunction-sections -fno-math-errno -Wall -Wextra 
 CXXFLAGS	+=	$(INCLUDE) $(DEFINES)
 
diff --git a/arm9/Makefile b/arm9/Makefile
index 90bff5f..94018e2 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -22,7 +22,7 @@ SOURCES		:=	../libn3ds/source ../libn3ds/source/drivers/mmc ../libn3ds/source/dr
 				../libn3ds/source/arm9/drivers ../libn3ds/thirdparty/fatfs ../source/arm9
 DATA		:=
 INCLUDES	:=	../libn3ds/include ../libn3ds/include/arm9 ../libn3ds/thirdparty ../include ../thirdparty
-DEFINES		:=	-D__ARM9__ -D_3DS -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
+DEFINES		:=	-D__ARM9__ -D__3DS__ -DLIBN3DS_LEGACY=1 -DVERS_STRING=\"$(VERS_STRING)\" \
 				-DVERS_MAJOR=$(VERS_MAJOR) -DVERS_MINOR=$(VERS_MINOR)
 
 ifneq ($(strip $(NO_DEBUG)),)
@@ -34,11 +34,11 @@ endif
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv5te -mtune=arm946e-s -mfloat-abi=soft -mtp=soft -marm -mthumb-interwork
 
-CFLAGS	:=	$(ARCH) -std=c17 -O2 -gdwarf-4 -flto -mword-relocations \
+CFLAGS	:=	$(ARCH) -std=c23 -O2 -gdwarf-4 -flto -mword-relocations \
 			-ffunction-sections -Wall -Wextra
 CFLAGS	+=	$(INCLUDE) $(DEFINES)
 
-CXXFLAGS	:=	$(ARCH) -std=c++17 -O2 -gdwarf-4 -flto -fno-rtti -fno-exceptions \
+CXXFLAGS	:=	$(ARCH) -std=c++23 -O2 -gdwarf-4 -flto -fno-rtti -fno-exceptions \
 				-mword-relocations -ffunction-sections -Wall -Wextra
 CXXFLAGS	+=	$(INCLUDE) $(DEFINES)