@@ -81,13 +81,10 @@
 # ifdef OF_HAVE_IPX
 #  import "OFIPXSocket.h"
 #  import "OFSPXSocket.h"
 #  import "OFSPXStreamSocket.h"
 # endif
-# ifdef OF_HAVE_SCTP
-#  import "OFSCTPSocket.h"
-# endif
 #endif
 #ifdef OF_HAVE_SOCKETS
 # ifdef OF_HAVE_THREADS
 #  import "OFHTTPClient.h"
 # endif
@@ -96,15 +93,15 @@
 # import "OFHTTPRequest.h"
 # import "OFHTTPResponse.h"
 # import "OFHTTPServer.h"
 #endif
 
-#ifdef OF_HAVE_PROCESSES
-# import "OFProcess.h"
+#ifdef OF_HAVE_SUBPROCESSES
+# import "OFSubprocess.h"
 #endif
 
-#import "OFCryptoHash.h"
+#import "OFCryptographicHash.h"
 #import "OFMD5Hash.h"
 #import "OFRIPEMD160Hash.h"
 #import "OFSHA1Hash.h"
 #import "OFSHA224Hash.h"
 #import "OFSHA256Hash.h"
@@ -117,11 +114,11 @@
 #import "OFXMLElement.h"
 #import "OFXMLAttribute.h"
 #import "OFXMLCharacters.h"
 #import "OFXMLCDATA.h"
 #import "OFXMLComment.h"
-#import "OFXMLProcessingInstructions.h"
+#import "OFXMLProcessingInstruction.h"
 #import "OFXMLParser.h"
 #import "OFXMLElementBuilder.h"
 
 #import "OFMessagePackExtension.h"
 
@@ -129,28 +126,15 @@
 #import "OFSystemInfo.h"
 #import "OFLocale.h"
 #import "OFOptionsParser.h"
 #import "OFTimer.h"
 #import "OFRunLoop.h"
-#import "OFSandbox.h"
 
 #ifdef OF_WINDOWS
 # import "OFWindowsRegistryKey.h"
 #endif
 
-#import "OFASN1BitString.h"
-#import "OFASN1Boolean.h"
-#import "OFASN1Enumerated.h"
-#import "OFASN1IA5String.h"
-#import "OFASN1Integer.h"
-#import "OFASN1NumericString.h"
-#import "OFASN1ObjectIdentifier.h"
-#import "OFASN1OctetString.h"
-#import "OFASN1PrintableString.h"
-#import "OFASN1UTF8String.h"
-#import "OFASN1Value.h"
-
 #import "OFAllocFailedException.h"
 #import "OFException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFAcceptFailedException.h"
 # import "OFAlreadyConnectedException.h"
@@ -225,11 +209,10 @@
 #import "OFRemoveItemFailedException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFResolveHostFailedException.h"
 #endif
 #import "OFRetrieveItemAttributesFailedException.h"
-#import "OFSandboxActivationFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSetItemAttributesFailedException.h"
 #import "OFSetOptionFailedException.h"
 #ifdef OF_WINDOWS
 # import "OFSetWindowsRegistryValueFailedException.h"
@@ -253,33 +236,29 @@
 #ifdef OF_HAVE_PLUGINS
 # import "OFPlugin.h"
 #endif
 
 #ifdef OF_HAVE_ATOMIC_OPS
-# import "atomic.h"
-#endif
-
-#import "OFLocking.h"
-#import "OFThread.h"
-#import "once.h"
-#ifdef OF_HAVE_THREADS
-# import "thread.h"
-# import "tlskey.h"
-# import "mutex.h"
-# import "condition.h"
-# import "OFThreadPool.h"
-# import "OFMutex.h"
-# import "OFRecursiveMutex.h"
-# import "OFCondition.h"
-#endif
-
-#import "base64.h"
-#import "crc16.h"
-#import "crc32.h"
-#import "huffman_tree.h"
-#import "of_asprintf.h"
-#import "of_strptime.h"
-#import "pbkdf2.h"
-#import "scrypt.h"
-#ifdef OF_HAVE_UNICODE_TABLES
-# import "unicode.h"
-#endif
+# import "OFAtomic.h"
+#endif
+#import "OFLocking.h"
+#import "OFOnce.h"
+#import "OFThread.h"
+#ifdef OF_HAVE_THREADS
+# import "OFCondition.h"
+# import "OFMutex.h"
+# 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"