Use __3DS__ instead of _3DS

libctru/Makefile

@@ -50,7 +50,7 @@ CFLAGS	:=	-g -Wall -Werror -mword-relocations \
 			$(ARCH) \
 			$(BUILD_CFLAGS)
 
-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS
+CFLAGS	+=	$(INCLUDE) -D__3DS__
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 

libctru/include/3ds.h

@@ -8,6 +8,11 @@
 extern "C" {
 #endif
 
+#if defined(_3DS) && !defined(__3DS__)
+#warning "Please update your Makefile and replace -DARM11 -D_3DS with -D__3DS__"
+#define __3DS__
+#endif
+
 //might be missing some
 #include <3ds/types.h>
 #include <3ds/result.h>

libctru/source/applets/error.c

@@ -1,4 +1,3 @@
-#include <3ds.h>
 #include <string.h>
 #include <3ds/types.h>
 #include <3ds/synchronization.h>