@@ -1,8 +1,11 @@
 include ../extra.mk
 
-SUBDIRS = ${TESTPLUGIN} ${SUBPROCESS} ${OBJC_SYNC} terminal
+SUBDIRS = ${TESTPLUGIN}	\
+	  ${SUBPROCESS}	\
+	  ${OBJC_SYNC}	\
+	  terminal
 
 CLEAN = EBOOT.PBP		\
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
 	${PROG_NOINST}.nds	\
@@ -12,13 +15,13 @@
 	testfile_ini.m
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
-SRCS = ${OF_BLOCK_TESTS_M}			\
-       ForwardingTests.m			\
+SRCS = ForwardingTests.m			\
        OFArrayTests.m				\
+       ${OF_BLOCK_TESTS_M}			\
        OFCharacterSetTests.m			\
        OFColorTests.m				\
        OFConcreteArrayTests.m			\
        OFConcreteDictionaryTests.m		\
        OFConcreteMutableArrayTests.m		\
@@ -76,13 +79,13 @@
 	       OFHTTPCookieTests.m		\
 	       OFKernelEventObserverTests.m	\
 	       OFSocketTests.m			\
 	       OFTCPSocketTests.m		\
 	       OFUDPSocketTests.m		\
+	       ${USE_SRCS_APPLETALK}		\
 	       ${USE_SRCS_IPX}			\
-	       ${USE_SRCS_UNIX_SOCKETS}		\
-	       ${USE_SRCS_APPLETALK}
+	       ${USE_SRCS_UNIX_SOCKETS}
 SRCS_APPLETALK = OFDDPSocketTests.m
 SRCS_IPX = OFIPXSocketTests.m		\
 	   OFSPXSocketTests.m		\
 	   OFSPXStreamSocketTests.m
 SRCS_UNIX_SOCKETS = OFUNIXDatagramSocketTests.m	\