@@ -9,11 +9,10 @@
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
 
 SRCS = OFApplication.m			\
        OFArray.m			\
-       OFArray_subarray.m		\
        OFAutoreleasePool.m		\
        OFBigDataArray.m			\
        OFBlock.m			\
        OFConstantString.m		\
        OFCountedSet.m			\
@@ -87,11 +86,10 @@
        crc32.m				\
        of_asprintf.m			\
        of_strptime.m			\
        pbkdf2.m				\
        scrypt.m				\
-       ${UNICODE_M}			\
        ${USE_SRCS_FILES}		\
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
        ${USE_SRCS_THREADS}
 SRCS_FILES = OFFile.m			\
@@ -142,10 +140,11 @@
 	    platform.h				\
 	    ${USE_INCLUDES_ATOMIC}
 
 SRCS += OFArray_adjacent.m		\
 	OFArray_adjacentSubarray.m	\
+	OFArray_subarray.m		\
 	OFCountedSet_hashtable.m	\
 	OFDictionary_hashtable.m	\
 	OFMutableArray_adjacent.m	\
 	OFMutableDictionary_hashtable.m	\
 	OFMutableSet_hashtable.m	\
@@ -155,10 +154,11 @@
 	${AUTORELEASE_M}		\
 	codepage_437.m			\
 	${FOUNDATION_COMPAT_M}		\
 	${INSTANCE_M}			\
 	iso_8859_15.m			\
+	${UNICODE_M}			\
 	windows_1252.m
 SRCS_FILES += OFSettings_INIFile.m
 SRCS_SOCKETS += ${OFKERNELEVENTOBSERVER_EPOLL_M}	\
 		${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
 		${OFKERNELEVENTOBSERVER_POLL_M}		\