@@ -8,13 +8,17 @@
 STATIC_LIB = ${OBJFW_STATIC_LIB}
 FRAMEWORK = ${OBJFW_FRAMEWORK}
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
 
-SRCS = OFApplication.m			\
+SRCS = OFASPrintF.m			\
+       OFApplication.m			\
        OFArray.m			\
+       OFBase64.m			\
        OFBlock.m			\
+       OFCRC16.m			\
+       OFCRC32.m			\
        OFCharacterSet.m			\
        OFColor.m			\
        OFConstantString.m		\
        OFCountedSet.m			\
        OFData.m				\
@@ -24,19 +28,20 @@
        OFDictionary.m			\
        OFEnumerator.m			\
        OFFileManager.m			\
        OFGZIPStream.m			\
        OFHMAC.m				\
+       OFHuffmanTree.m			\
        OFInflate64Stream.m		\
        OFInflateStream.m		\
        OFInvocation.m			\
        OFLHAArchive.m			\
        OFLHAArchiveEntry.m		\
        OFList.m				\
        OFLocale.m			\
-       OFMapTable.m			\
        OFMD5Hash.m			\
+       OFMapTable.m			\
        OFMessagePackExtension.m		\
        OFMethodSignature.m		\
        OFMutableArray.m			\
        OFMutableData.m			\
        OFMutableDictionary.m		\
@@ -51,27 +56,31 @@
        OFNull.m				\
        OFNumber.m			\
        OFObject.m			\
        OFObject+KeyValueCoding.m	\
        OFObject+Serialization.m		\
+       OFOnce.m				\
        OFOptionsParser.m		\
+       OFPBKDF2.m			\
        OFPair.m				\
        OFRIPEMD160Hash.m		\
        OFRunLoop.m			\
-       OFSandbox.m			\
-       OFSecureData.m			\
-       OFSeekableStream.m		\
-       OFSet.m				\
        OFSHA1Hash.m			\
        OFSHA224Hash.m			\
        OFSHA224Or256Hash.m		\
        OFSHA256Hash.m			\
        OFSHA384Hash.m			\
        OFSHA384Or512Hash.m		\
        OFSHA512Hash.m			\
+       OFScrypt.m			\
+       OFSecureData.m			\
+       OFSeekableStream.m		\
+       OFSerialization.m		\
+       OFSet.m				\
        OFSortedList.m			\
        OFStdIOStream.m			\
+       OFStrPTime.m			\
        OFStream.m			\
        OFString.m			\
        OFString+CryptographicHashing.m	\
        OFString+JSONParsing.m		\
        OFString+PropertyListParsing.m	\
@@ -96,23 +105,13 @@
        OFXMLElement.m			\
        OFXMLElement+Serialization.m	\
        OFXMLElementBuilder.m		\
        OFXMLNode.m			\
        OFXMLParser.m			\
-       OFXMLProcessingInstructions.m	\
+       OFXMLProcessingInstruction.m	\
        OFZIPArchive.m			\
        OFZIPArchiveEntry.m		\
-       base64.m				\
-       crc16.m				\
-       crc32.m				\
-       huffman_tree.m			\
-       of_asprintf.m			\
-       of_strptime.m			\
-       once.m				\
-       pbkdf2.m				\
-       scrypt.m				\
-       ${UNICODE_M}			\
        ${USE_SRCS_FILES}		\
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
        ${USE_SRCS_THREADS}		\
        ${USE_SRCS_WINDOWS}
@@ -135,45 +134,43 @@
 	       OFHTTPCookieManager.m		\
 	       OFHTTPRequest.m			\
 	       OFHTTPResponse.m			\
 	       OFHTTPServer.m			\
 	       OFSequencedPacketSocket.m	\
+	       OFSocket.m			\
 	       OFStreamSocket.m			\
 	       OFTCPSocket.m			\
 	       OFUDPSocket.m			\
-	       socket.m				\
 	       ${USE_SRCS_IPX}
 SRCS_THREADS = OFCondition.m		\
 	       OFMutex.m		\
+	       OFPlainCondition.m	\
+	       OFPlainMutex.m		\
+	       OFPlainThread.m		\
 	       OFRecursiveMutex.m	\
-	       OFThreadPool.m		\
-	       condition.m		\
-	       mutex.m			\
-	       thread.m			\
-	       tlskey.m
+	       OFTLSKey.m		\
+	       OFThreadPool.m
 SRCS_WINDOWS = OFWin32ConsoleStdIOStream.m	\
 	       OFWindowsRegistryKey.m
 
-INCLUDES_ATOMIC = atomic.h			\
-		  atomic_builtins.h		\
-		  atomic_no_threads.h		\
-		  atomic_osatomic.h		\
-		  atomic_powerpc.h		\
-		  atomic_sync_builtins.h	\
-		  atomic_x86.h
+INCLUDES_ATOMIC = OFAtomic.h			\
+		  OFAtomic_builtins.h		\
+		  OFAtomic_no_threads.h		\
+		  OFAtomic_osatomic.h		\
+		  OFAtomic_powerpc.h		\
+		  OFAtomic_sync_builtins.h	\
+		  OFAtomic_x86.h
 INCLUDES := ${SRCS:.m=.h}			\
 	    OFCollection.h			\
 	    OFCryptographicHash.h		\
 	    OFJSONRepresentation.h		\
 	    OFKernelEventObserver.h		\
 	    OFKeyValueCoding.h			\
 	    OFLocking.h				\
 	    OFMessagePackRepresentation.h	\
-	    OFSerialization.h			\
 	    OFTLSSocket.h			\
 	    ObjFW.h				\
-	    block.h				\
 	    macros.h				\
 	    objfw-defs.h			\
 	    platform.h				\
 	    ${USE_INCLUDES_ATOMIC}
 
@@ -180,11 +177,10 @@
 SRCS += OFAdjacentArray.m		\
 	OFAdjacentSubarray.m		\
 	OFBitSetCharacterSet.m		\
 	OFBytesValue.m			\
 	OFCountedMapTableSet.m		\
-	OFDimensionValue.m		\
 	OFInvertedCharacterSet.m	\
 	OFLHADecompressingStream.m	\
 	OFMapTableDictionary.m		\
 	OFMapTableSet.m			\
 	OFMutableAdjacentArray.m	\
@@ -194,16 +190,19 @@
 	OFNonretainedObjectValue.m	\
 	OFPointValue.m			\
 	OFPointerValue.m		\
 	OFRangeCharacterSet.m		\
 	OFRangeValue.m			\
-	OFRectangleValue.m		\
+	OFRectValue.m			\
+	OFSandbox.m			\
+	OFSizeValue.m			\
 	OFSubarray.m			\
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
-	${RUNTIME_INSTANCE_M}
+	${RUNTIME_INSTANCE_M}		\
+       ${UNICODE_M}
 SRCS_FILES += OFFileURLHandler.m	\
 	      OFINIFileSettings.m
 SRCS_SOCKETS += OFDNSResolverSettings.m			\
 		OFHTTPURLHandler.m			\
 		OFHostAddressResolver.m			\