@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -43,15 +43,21 @@
 #import "OFMethodSignature.h"
 #import "OFInvocation.h"
 
 #import "OFNumber.h"
 #import "OFDate.h"
+#import "OFUUID.h"
 #import "OFURL.h"
 #import "OFURLHandler.h"
 #import "OFColor.h"
 
+#import "OFNotification.h"
+#import "OFNotificationCenter.h"
+
 #import "OFStream.h"
+#import "OFSeekableStream.h"
+#import "OFMemoryStream.h"
 #import "OFStdIOStream.h"
 #import "OFInflateStream.h"
 #import "OFInflate64Stream.h"
 #import "OFGZIPStream.h"
 #import "OFLHAArchive.h"
@@ -61,20 +67,20 @@
 #import "OFZIPArchive.h"
 #import "OFZIPArchiveEntry.h"
 #import "OFFileManager.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
-# import "OFINIFile.h"
-# import "OFSettings.h"
 #endif
+#import "OFINIFile.h"
+#import "OFSettings.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFStreamSocket.h"
 # import "OFDatagramSocket.h"
 # import "OFSequencedPacketSocket.h"
 # import "OFTCPSocket.h"
 # import "OFUDPSocket.h"
-# import "OFTLSSocket.h"
+# import "OFTLSStream.h"
 # import "OFKernelEventObserver.h"
 # import "OFDNSQuery.h"
 # import "OFDNSResourceRecord.h"
 # import "OFDNSResponse.h"
 # import "OFDNSResolver.h"
@@ -84,12 +90,14 @@
 #  import "OFSPXStreamSocket.h"
 # endif
 # ifdef OF_HAVE_SCTP
 #  import "OFSCTPSocket.h"
 # endif
-#endif
-#ifdef OF_HAVE_SOCKETS
+# ifdef OF_HAVE_UNIX_SOCKETS
+#  import "OFUNIXDatagramSocket.h"
+#  import "OFUNIXStreamSocket.h"
+# endif
 # ifdef OF_HAVE_THREADS
 #  import "OFHTTPClient.h"
 # endif
 # import "OFHTTPCookie.h"
 # import "OFHTTPCookieManager.h"
@@ -174,10 +182,11 @@
 #import "OFGetOptionFailedException.h"
 #ifdef OF_WINDOWS
 # import "OFGetWindowsRegistryValueFailedException.h"
 #endif
 #import "OFHashAlreadyCalculatedException.h"
+#import "OFHashNotCalculatedException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFHTTPRequestFailedException.h"
 #endif
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
@@ -192,11 +201,10 @@
 #ifdef OF_HAVE_PLUGINS
 # import "OFLoadPluginFailedException.h"
 #endif
 #import "OFLockFailedException.h"
 #import "OFMalformedXMLException.h"
-#import "OFMemoryNotPartOfObjectException.h"
 #import "OFMoveItemFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFObserveFailedException.h"
@@ -224,10 +232,13 @@
 #ifdef OF_HAVE_THREADS
 # import "OFThreadJoinFailedException.h"
 # import "OFThreadStartFailedException.h"
 # import "OFThreadStillRunningException.h"
 #endif
+#ifdef OF_HAVE_SOCKETS
+# import "OFTLSHandshakeFailedException.h"
+#endif
 #import "OFTruncatedDataException.h"
 #import "OFUnboundNamespaceException.h"
 #import "OFUnboundPrefixException.h"
 #import "OFUndefinedKeyException.h"
 #import "OFUnknownXMLEntityException.h"
@@ -252,16 +263,9 @@
 # import "OFPlainCondition.h"
 # import "OFPlainMutex.h"
 # import "OFPlainThread.h"
 # 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"