Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -8,17 +8,13 @@
 STATIC_LIB = ${OBJFW_STATIC_LIB}
 FRAMEWORK = ${OBJFW_FRAMEWORK}
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
 
-SRCS = OFASPrintF.m			\
-       OFApplication.m			\
+SRCS = OFApplication.m			\
        OFArray.m			\
-       OFBase64.m			\
        OFBlock.m			\
-       OFCRC16.m			\
-       OFCRC32.m			\
        OFCharacterSet.m			\
        OFColor.m			\
        OFConstantString.m		\
        OFCountedSet.m			\
        OFData.m				\
@@ -78,11 +74,10 @@
        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	\
@@ -177,14 +172,18 @@
 	    macros.h				\
 	    objfw-defs.h			\
 	    platform.h				\
 	    ${USE_INCLUDES_ATOMIC}
 
-SRCS += OFAdjacentArray.m		\
+SRCS += OFASPrintF.m			\
+	OFAdjacentArray.m		\
 	OFAdjacentSubarray.m		\
+	OFBase64.m			\
 	OFBitSetCharacterSet.m		\
 	OFBytesValue.m			\
+	OFCRC16.m			\
+	OFCRC32.m			\
 	OFCountedMapTableSet.m		\
 	OFInvertedCharacterSet.m	\
 	OFLHADecompressingStream.m	\
 	OFMapTableDictionary.m		\
 	OFMapTableSet.m			\
@@ -198,10 +197,11 @@
 	OFRangeCharacterSet.m		\
 	OFRangeValue.m			\
 	OFRectValue.m			\
 	OFSandbox.m			\
 	OFSizeValue.m			\
+	OFStrPTime.m			\
 	OFSubarray.m			\
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\

Index: src/ObjFW.h
==================================================================
--- src/ObjFW.h
+++ src/ObjFW.h
@@ -263,13 +263,7 @@
 # import "OFRecursiveMutex.h"
 # import "OFTLSKey.h"
 # import "OFThreadPool.h"
 #endif
 
-#import "OFASPrintF.h"
-#import "OFBase64.h"
-#import "OFCRC16.h"
-#import "OFCRC32.h"
-#import "OFHuffmanTree.h"
 #import "OFPBKDF2.h"
 #import "OFScrypt.h"
-#import "OFStrPTime.h"

Index: tests/OFDateTests.m
==================================================================
--- tests/OFDateTests.m
+++ tests/OFDateTests.m
@@ -16,10 +16,11 @@
 #include "config.h"
 
 #include <time.h>
 
 #import "TestsAppDelegate.h"
+#import "OFStrPTime.h"
 
 static OFString *const module = @"OFDate";
 
 @implementation TestsAppDelegate (OFDateTests)
 - (void)dateTests